[PHP-CVS] cvs: php-src /ext/phar config.m4 phar.c phar_internal.h phar_object.c util.c /ext/phar/tests phar_get_supported_signatures_002a.phpt phar_setsignaturealgo2.phpt test_signaturealgos.phpt /e
cellog Thu Oct 9 00:51:27 2008 UTC
Modified files:
/php-src/ext/phar config.m4 phar.c phar_internal.h phar_object.c
util.c
/php-src/ext/phar/tests phar_get_supported_signatures_002a.phpt
phar_setsignaturealgo2.phpt
test_signaturealgos.phpt
/php-src/ext/phar/tests/tar phar_setsignaturealgo2.phpt
Log:
MFB: fix bug #45907: undefined reference to PHP_SHA512Init
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.32 php-src/ext/phar/config.m4:1.33
--- php-src/ext/phar/config.m4:1.32 Sat Aug 2 15:37:38 2008
+++ php-src/ext/phar/config.m4 Thu Oct 9 00:51:27 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.32 2008/08/02 15:37:38 sfox Exp $
+dnl $Id: config.m4,v 1.33 2008/10/09 00:51:27 cellog Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
@@ -7,6 +7,11 @@
if test $PHP_PHAR != no; then
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
AC_MSG_CHECKING([for phar openssl support])
+ if test $PHP_HASH_SHARED != yes; then
+AC_DEFINE(PHAR_HASH_OK,1,[ ])
+ else
+AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is
built shared])
+ fi
if test $PHP_OPENSSL_SHARED = yes; then
AC_MSG_RESULT([no (shared openssl)])
else
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.387r2=1.388diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.387 php-src/ext/phar/phar.c:1.388
--- php-src/ext/phar/phar.c:1.387 Tue Sep 30 02:40:37 2008
+++ php-src/ext/phar/phar.c Thu Oct 9 00:51:27 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.387 2008/09/30 02:40:37 cellog Exp $ */
+/* $Id: phar.c,v 1.388 2008/10/09 00:51:27 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -838,7 +838,7 @@
efree(sig);
}
break;
-#if HAVE_HASH_EXT
+#if PHAR_HASH_OK
case PHAR_SIG_SHA512: {
unsigned char digest[64];
@@ -3108,7 +3108,7 @@
}
switch(phar-sig_flags) {
-#ifndef HAVE_HASH_EXT
+#ifndef PHAR_HASH_OK
case PHAR_SIG_SHA512:
case PHAR_SIG_SHA256:
if (closeoldfile) {
@@ -3620,7 +3620,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.387 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.388 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.118r2=1.119diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.118
php-src/ext/phar/phar_internal.h:1.119
--- php-src/ext/phar/phar_internal.h:1.118 Sun Sep 14 06:32:52 2008
+++ php-src/ext/phar/phar_internal.hThu Oct 9 00:51:27 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_internal.h,v 1.118 2008/09/14 06:32:52 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.119 2008/10/09 00:51:27 cellog Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -66,7 +66,7 @@
#ifdef HAVE_STDINT_H
#include stdint.h
#endif
-#ifdef HAVE_HASH_EXT
+#ifdef PHAR_HASH_OK
#include ext/hash/php_hash.h
#include ext/hash/php_hash_sha.h
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.284r2=1.285diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.284
php-src/ext/phar/phar_object.c:1.285
--- php-src/ext/phar/phar_object.c:1.284Sat Sep 13 22:31:18 2008
+++ php-src/ext/phar/phar_object.c Thu Oct 9 00:51:27 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.284 2008/09/13 22:31:18 cellog Exp $ */
+/* $Id: phar_object.c,v 1.285 2008/10/09 00:51:27 cellog Exp $ */
#include phar_internal.h
#include func_interceptors.h
@@ -1271,7 +1271,7 @@
add_next_index_stringl(return_value, MD5, 3, 1);
add_next_index_stringl(return_value, SHA-1, 5, 1);
-#ifdef HAVE_HASH_EXT
+#ifdef PHAR_HASH_OK
add_next_index_stringl(return_value, SHA-256, 7, 1);
[PHP-CVS] cvs: php-src /ext/phar config.m4
sfoxSat Aug 2 15:37:38 2008 UTC Modified files: /php-src/ext/phar config.m4 Log: - Remove obsolete check http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.31r2=1.32diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.31 php-src/ext/phar/config.m4:1.32 --- php-src/ext/phar/config.m4:1.31 Fri Aug 1 13:45:05 2008 +++ php-src/ext/phar/config.m4 Sat Aug 2 15:37:38 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.31 2008/08/01 13:45:05 sfox Exp $ +dnl $Id: config.m4,v 1.32 2008/08/02 15:37:38 sfox Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -6,8 +6,6 @@ if test $PHP_PHAR != no; then PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) - PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) - PHP_SUBST(PHAR_SHARED_LIBADD) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_OPENSSL_SHARED = yes; then AC_MSG_RESULT([no (shared openssl)]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar config.m4 /ext/sockets sockets.c /ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /main/streams xp_socket.c
janiWed Jul 16 14:08:04 2008 UTC
Modified files:
/php-src/ext/phar config.m4
/php-src/ext/socketssockets.c
/php-src/ext/sockets/tests ipv4loop.phpt ipv6loop.phpt
/php-src/main/streams xp_socket.c
Log:
- Fixed bug #44127 (UNIX abstract namespace socket connect does not work)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.28 php-src/ext/phar/config.m4:1.29
--- php-src/ext/phar/config.m4:1.28 Sat May 17 20:07:38 2008
+++ php-src/ext/phar/config.m4 Wed Jul 16 14:08:02 2008
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.28 2008/05/17 20:07:38 cellog Exp $
+dnl $Id: config.m4,v 1.29 2008/07/16 14:08:02 jani Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
-[ --enable-phar Enable phar support])
+[ --disable-phar Disable phar support], yes)
if test $PHP_PHAR != no; then
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.198r2=1.199diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.198 php-src/ext/sockets/sockets.c:1.199
--- php-src/ext/sockets/sockets.c:1.198 Fri Jul 4 14:10:24 2008
+++ php-src/ext/sockets/sockets.c Wed Jul 16 14:08:04 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.198 2008/07/04 14:10:24 felipe Exp $ */
+/* $Id: sockets.c,v 1.199 2008/07/16 14:08:04 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1318,8 +1318,8 @@
memset(s_un, 0, sizeof(struct sockaddr_un));
s_un.sun_family = AF_UNIX;
- snprintf(s_un.sun_path, 108, %s, addr);
- retval = connect(php_sock-bsd_socket, (struct sockaddr
*) s_un, SUN_LEN(s_un));
+ memcpy(s_un.sun_path, addr, addr_len);
+ retval = connect(php_sock-bsd_socket, (struct sockaddr
*) s_un, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + addr_len);
break;
default:
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv4loop.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/sockets/tests/ipv4loop.phpt
diff -u php-src/ext/sockets/tests/ipv4loop.phpt:1.1
php-src/ext/sockets/tests/ipv4loop.phpt:1.2
--- php-src/ext/sockets/tests/ipv4loop.phpt:1.1 Thu Apr 17 23:09:17 2003
+++ php-src/ext/sockets/tests/ipv4loop.phpt Wed Jul 16 14:08:04 2008
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (!extension_loaded('sockets')) {
- die('skip sockets extenion not available.');
+ die('skip sockets extension not available.');
}
?
--FILE--
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.3
php-src/ext/sockets/tests/ipv6loop.phpt:1.4
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.3 Mon Feb 12 14:48:52 2007
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:08:04 2008
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (!extension_loaded('sockets')) {
- die('skip sockets extenion not available.');
+ die('skip sockets extension not available.');
}
if (!defined(AF_INET6)) {
die('skip no IPv6 support');
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.46r2=1.47diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.46
php-src/main/streams/xp_socket.c:1.47
--- php-src/main/streams/xp_socket.c:1.46 Fri Jul 11 10:24:29 2008
+++ php-src/main/streams/xp_socket.cWed Jul 16 14:08:04 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.46 2008/07/11 10:24:29 tony2001 Exp $ */
+/* $Id: xp_socket.c,v 1.47 2008/07/16 14:08:04 jani Exp $ */
#include php.h
#include ext/standard/file.h
@@ -621,7 +621,7 @@
parse_unix_address(xparam, unix_addr TSRMLS_CC);
ret = php_network_connect_socket(sock-socket,
- (const struct sockaddr *)unix_addr,
(socklen_t)sizeof(unix_addr),
+ (const struct sockaddr *)unix_addr,
(socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + xparam-inputs.namelen,
xparam-op == STREAM_XPORT_OP_CONNECT_ASYNC,
xparam-inputs.timeout,
xparam-want_errortext ?
xparam-outputs.error_text : NULL,
err);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar config.m4
janiWed Jul 16 14:12:33 2008 UTC Modified files: /php-src/ext/phar config.m4 Log: - Revert (dunno why I had this like this..) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.29r2=1.30diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.29 php-src/ext/phar/config.m4:1.30 --- php-src/ext/phar/config.m4:1.29 Wed Jul 16 14:08:02 2008 +++ php-src/ext/phar/config.m4 Wed Jul 16 14:12:33 2008 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.29 2008/07/16 14:08:02 jani Exp $ +dnl $Id: config.m4,v 1.30 2008/07/16 14:12:33 jani Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, -[ --disable-phar Disable phar support], yes) +[ --enable-phar Enable phar support]) if test $PHP_PHAR != no; then PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar config.m4 config.w32 phar.c phar_internal.h phar_object.c zip.c
cellog Sat May 17 20:07:38 2008 UTC
Modified files:
/php-src/ext/phar config.m4 config.w32 phar.c phar_internal.h
phar_object.c zip.c
Log:
enable by default statically instead of shared
this is done by removing zlib/bz2 explicit dependencies because they are
unnecessary
we only ever use the stream filter, and the check for existence has
been moved to runtime where it is after startup
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27 php-src/ext/phar/config.m4:1.28
--- php-src/ext/phar/config.m4:1.27 Mon Jan 28 08:52:06 2008
+++ php-src/ext/phar/config.m4 Sat May 17 20:07:38 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27 2008/01/28 08:52:06 cellog Exp $
+dnl $Id: config.m4,v 1.28 2008/05/17 20:07:38 cellog Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
@@ -8,8 +8,6 @@
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
PHP_SUBST(PHAR_SHARED_LIBADD)
- PHP_ADD_EXTENSION_DEP(phar, zlib, true)
- PHP_ADD_EXTENSION_DEP(phar, bz2, true)
PHP_ADD_EXTENSION_DEP(phar, spl, true)
PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27 php-src/ext/phar/config.w32:1.28
--- php-src/ext/phar/config.w32:1.27Mon Jan 28 14:39:16 2008
+++ php-src/ext/phar/config.w32 Sat May 17 20:07:38 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.27 2008/01/28 14:39:16 sfox Exp $
+// $Id: config.w32,v 1.28 2008/05/17 20:07:38 cellog Exp $
// vim:ft=javascript
ARG_ENABLE(phar, enable phar support, no);
@@ -8,7 +8,5 @@
if (PHP_PHAR_SHARED) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
- ADD_EXTENSION_DEP('phar', 'bz2', true);
ADD_EXTENSION_DEP('phar', 'spl', true);
- ADD_EXTENSION_DEP('phar', 'zlib', true);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.373r2=1.374diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.373 php-src/ext/phar/phar.c:1.374
--- php-src/ext/phar/phar.c:1.373 Wed May 14 21:27:31 2008
+++ php-src/ext/phar/phar.c Sat May 17 20:07:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.373 2008/05/14 21:27:31 sfox Exp $ */
+/* $Id: phar.c,v 1.374 2008/05/17 20:07:38 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -25,8 +25,6 @@
#include func_interceptors.h
ZEND_DECLARE_MODULE_GLOBALS(phar)
-int phar_has_bz2;
-int phar_has_zlib;
#if PHP_VERSION_ID = 50300
char *(*phar_save_resolve_path)(const char *filename, int filename_len
TSRMLS_DC);
#endif
@@ -886,7 +884,7 @@
offset += entry.compressed_filesize;
switch (entry.flags PHAR_ENT_COMPRESSION_MASK) {
case PHAR_ENT_COMPRESSED_GZ:
- if (!phar_has_zlib) {
+ if (!PHAR_G(has_zlib)) {
if (entry.metadata) {
zval_ptr_dtor(entry.metadata);
}
@@ -895,7 +893,7 @@
}
break;
case PHAR_ENT_COMPRESSED_BZ2:
- if (!phar_has_bz2) {
+ if (!PHAR_G(has_bz2)) {
if (entry.metadata) {
zval_ptr_dtor(entry.metadata);
}
@@ -1307,7 +1305,7 @@
/* to properly decompress, we have to tell zlib
to look for a zlib or gzip header */
zval filterparams;
- if (!phar_has_zlib) {
+ if (!PHAR_G(has_zlib)) {
MAPPHAR_ALLOC_FAIL(unable to
decompress gzipped phar archive \%s\ to temporary file, enable zlib extension
in php.ini)
}
array_init(filterparams);
@@ -1358,7 +1356,7 @@
php_stream_filter *filter;
php_stream *temp;
- if (!phar_has_bz2) {
+ if (!PHAR_G(has_bz2)) {
MAPPHAR_ALLOC_FAIL(unable to
decompress bzipped phar archive \%s\ to temporary file, enable bz2 extension
in php.ini)
}
/* entire file is bzip-compressed, uncompress
to temporary file */
@@ -2943,8 +2941,6 @@
ZEND_INIT_MODULE_GLOBALS(phar, php_phar_init_globals_module, NULL);
