[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
cellog Mon Feb 16 16:41:41 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: re-enable ext/phar on big-endian systems, fixes verified as workign http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.12r2=1.27.2.13diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.12 php-src/ext/phar/config.m4:1.27.2.13 --- php-src/ext/phar/config.m4:1.27.2.12Sun Feb 15 18:53:22 2009 +++ php-src/ext/phar/config.m4 Mon Feb 16 16:41:40 2009 @@ -1,15 +1,10 @@ -dnl $Id: config.m4,v 1.27.2.12 2009/02/15 18:53:22 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.13 2009/02/16 16:41:40 cellog Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) if test $PHP_PHAR != no; then - PHP_C_BIGENDIAN - if test $ac_cv_c_bigendian_php = yes; then -AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) -PHP_PHAR=no - else 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 @@ -32,5 +27,4 @@ PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT - fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 tar.c
cellog Sun Feb 15 18:51:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 tar.c Log: fix setting of 32-bit value on big-endian systems http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.10r2=1.27.2.11diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.10 php-src/ext/phar/config.m4:1.27.2.11 --- php-src/ext/phar/config.m4:1.27.2.10Wed Jan 28 20:39:15 2009 +++ php-src/ext/phar/config.m4 Sun Feb 15 18:51:46 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.10 2009/01/28 20:39:15 johannes Exp $ +dnl $Id: config.m4,v 1.27.2.11 2009/02/15 18:51:46 cellog Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -6,10 +6,10 @@ if test $PHP_PHAR != no; then PHP_C_BIGENDIAN - if test $ac_cv_c_bigendian_php = yes; then -AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) -PHP_PHAR=no - else +dnl if test $ac_cv_c_bigendian_php = yes; then +dnlAC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) +dnlPHP_PHAR=no +dnl else 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 @@ -32,5 +32,5 @@ PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT - fi +dnl fi fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.25r2=1.55.2.26diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.25 php-src/ext/phar/tar.c:1.55.2.26 --- php-src/ext/phar/tar.c:1.55.2.25Wed Dec 31 11:15:42 2008 +++ php-src/ext/phar/tar.c Sun Feb 15 18:51:46 2009 @@ -1084,10 +1084,10 @@ #ifdef WORDS_BIGENDIAN # define PHAR_SET_32(var, buffer) \ - *(php_uint32 *)(var) = (unsigned char*)(buffer))[3]) 24) \ - | unsigned char*)(buffer))[2]) 16) \ - | unsigned char*)(buffer))[1]) 8) \ - | (((unsigned char*)(buffer))[0])) + *(php_uint32 *)(var) = (unsigned char*)(buffer))[3]) 24) \ + | unsigned char*)(buffer))[2]) 16) \ + | unsigned char*)(buffer))[1]) 8) \ + | (((unsigned char*)(buffer))[0])) #else # define PHAR_SET_32(var, buffer) *(php_uint32 *)(var) = (php_uint32) (buffer) #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
cellog Sun Feb 15 18:53:22 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: revert accidental commit of config.m4, big-endian isn't ready quite yet http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.11r2=1.27.2.12diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.11 php-src/ext/phar/config.m4:1.27.2.12 --- php-src/ext/phar/config.m4:1.27.2.11Sun Feb 15 18:51:46 2009 +++ php-src/ext/phar/config.m4 Sun Feb 15 18:53:22 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.11 2009/02/15 18:51:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.12 2009/02/15 18:53:22 cellog Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -6,10 +6,10 @@ if test $PHP_PHAR != no; then PHP_C_BIGENDIAN -dnl if test $ac_cv_c_bigendian_php = yes; then -dnlAC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) -dnlPHP_PHAR=no -dnl else + if test $ac_cv_c_bigendian_php = yes; then +AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) +PHP_PHAR=no + else 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 @@ -32,5 +32,5 @@ PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT -dnl fi + fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
johannesWed Jan 28 20:39:16 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: Properly disable phar for the moment http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.9r2=1.27.2.10diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.9 php-src/ext/phar/config.m4:1.27.2.10 --- php-src/ext/phar/config.m4:1.27.2.9 Wed Jan 28 15:53:29 2009 +++ php-src/ext/phar/config.m4 Wed Jan 28 20:39:15 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.9 2009/01/28 15:53:29 scottmac Exp $ +dnl $Id: config.m4,v 1.27.2.10 2009/01/28 20:39:15 johannes Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,6 +8,7 @@ PHP_C_BIGENDIAN if test $ac_cv_c_bigendian_php = yes; then AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) +PHP_PHAR=no else 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]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then 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 fi As far as I can tell that acomplishes the same. Onlz zou German kb? ;) changed the original logic a lot rather then trzing to keep as much of it as possible. Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Doesnät matter. This helps me figuring out what is wrong. In CVS? Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). Zep, that's a good point. And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! Since I cannot test on windows I need windows developers like zou to fix it. I haven't been able to test 5.3 in months.. I'll fix/test/merge out of PECL 5.2 once it's working under *nix, but currently it doesn't seem to be working anywhere :) - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Hello Steph, Tuesday, November 4, 2008, 2:42:05 PM, you wrote: Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then 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 fi As far as I can tell that acomplishes the same. Onlz zou German kb? ;) oops changed the original logic a lot rather then trzing to keep as much of it as possible. Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' read again. It says if it is shared then issue an error. If it is present then use it. The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Doesnät matter. This helps me figuring out what is wrong. In CVS? Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). Zep, that's a good point. And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! Since I cannot test on windows I need windows developers like zou to fix it. I haven't been able to test 5.3 in months.. I'll fix/test/merge out of PECL 5.2 once it's working under *nix, but currently it doesn't seem to be working anywhere :) - Steph Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then 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 fi The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! - Steph - Original Message - From: Marcus Boerger [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Tuesday, November 04, 2008 1:27 AM Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c helly Tue Nov 4 01:27:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 util.c Log: - MFH Fix dependency from Phar to hash http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7r2=1.27.2.8diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8 --- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct 9 00:50:46 2008 +++ php-src/ext/phar/config.m4 Tue Nov 4 01:27:52 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,7 +8,9 @@ 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,[ ]) +if test $PHP_HASH != no; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39r2=1.55.2.40diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40 --- php-src/ext/phar/util.c:1.55.2.39 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/util.c Tue Nov 4 01:27:52 2008 @@ -18,9 +18,12 @@ +--+ */ -/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */ #include phar_internal.h +#ifdef PHAR_HASH_OK +#include ext/hash/php_hash_sha.h +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' read again. It says if it is shared then issue an error. If it is present then use it. Args, sorry. I misread the commit and thought you'd removed the first line in that block, so yes the check is now correct in config.m4. But - since when is hash not optional? - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Hello Steph, Tuesday, November 4, 2008, 2:52:48 PM, you wrote: Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' read again. It says if it is shared then issue an error. If it is present then use it. Args, sorry. I misread the commit and thought you'd removed the first line in that block, so yes the check is now correct in config.m4. But - since when is hash not optional? It still is optional :-) Only if it is shared we cannot rely on it for higher SHA. Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
But - since when is hash not optional? It still is optional :-) Only if it is shared we cannot rely on it for higher SHA. Grr no exports. OK, gotcha now, sorry for the noise. - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Hello Steph, Tuesday, November 4, 2008, 1:12:32 PM, you wrote: Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then 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 fi As far as I can tell that acomplishes the same. Onlz zou changed the original logic a lot rather then trzing to keep as much of it as possible. The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Doesnät matter. This helps me figuring out what is wrong. Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). Zep, that's a good point. And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! Since I cannot test on windows I need windows developers like zou to fix it. - Steph - Original Message - From: Marcus Boerger [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Tuesday, November 04, 2008 1:27 AM Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c helly Tue Nov 4 01:27:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 util.c Log: - MFH Fix dependency from Phar to hash http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7r2=1.27.2.8diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8 --- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct 9 00:50:46 2008 +++ php-src/ext/phar/config.m4 Tue Nov 4 01:27:52 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,7 +8,9 @@ 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,[ ]) +if test $PHP_HASH != no; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39r2=1.55.2.40diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40 --- php-src/ext/phar/util.c:1.55.2.39 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/util.c Tue Nov 4 01:27:52 2008 @@ -18,9 +18,12 @@ +--+ */ -/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */ #include phar_internal.h +#ifdef PHAR_HASH_OK +#include ext/hash/php_hash_sha.h +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
helly Tue Nov 4 01:27:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 util.c Log: - MFH Fix dependency from Phar to hash http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7r2=1.27.2.8diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8 --- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct 9 00:50:46 2008 +++ php-src/ext/phar/config.m4 Tue Nov 4 01:27:52 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,7 +8,9 @@ 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,[ ]) +if test $PHP_HASH != no; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39r2=1.55.2.40diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40 --- php-src/ext/phar/util.c:1.55.2.39 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/util.c Tue Nov 4 01:27:52 2008 @@ -18,9 +18,12 @@ +--+ */ -/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */ #include phar_internal.h +#ifdef PHAR_HASH_OK +#include ext/hash/php_hash_sha.h +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /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
cellog Thu Oct 9 00:50:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/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:
fix bug #45907: undefined reference to PHP_SHA512Init
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.6r2=1.27.2.7diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27.2.6 php-src/ext/phar/config.m4:1.27.2.7
--- php-src/ext/phar/config.m4:1.27.2.6 Sat Aug 2 15:38:46 2008
+++ php-src/ext/phar/config.m4 Thu Oct 9 00:50:46 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27.2.6 2008/08/02 15:38:46 sfox Exp $
+dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 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.370.2.48r2=1.370.2.49diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.48 php-src/ext/phar/phar.c:1.370.2.49
--- php-src/ext/phar/phar.c:1.370.2.48 Tue Sep 30 02:40:17 2008
+++ php-src/ext/phar/phar.c Thu Oct 9 00:50:46 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.48 2008/09/30 02:40:17 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.49 2008/10/09 00:50:46 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.370.2.48 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.49 $);
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.109.2.26r2=1.109.2.27diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.109.2.26
php-src/ext/phar/phar_internal.h:1.109.2.27
--- php-src/ext/phar/phar_internal.h:1.109.2.26 Sun Sep 14 06:31:19 2008
+++ php-src/ext/phar/phar_internal.hThu Oct 9 00:50:46 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_internal.h,v 1.109.2.26 2008/09/14 06:31:19 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.109.2.27 2008/10/09 00:50:46 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.266.2.48r2=1.266.2.49diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.48
php-src/ext/phar/phar_object.c:1.266.2.49
--- php-src/ext/phar/phar_object.c:1.266.2.48 Sat Sep 13 22:30:55 2008
+++ php-src/ext/phar/phar_object.c Thu Oct 9 00:50:46 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.266.2.48 2008/09/13 22:30:55 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.49 2008/10/09 00:50:46 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,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
sfoxSat Aug 2 15:38:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: MFH Remove obsolete check (thanks Tony) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.5r2=1.27.2.6diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.5 php-src/ext/phar/config.m4:1.27.2.6 --- php-src/ext/phar/config.m4:1.27.2.5 Mon Jul 14 09:02:26 2008 +++ php-src/ext/phar/config.m4 Sat Aug 2 15:38:46 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.5 2008/07/14 09:02:26 jani Exp $ +dnl $Id: config.m4,v 1.27.2.6 2008/08/02 15:38:46 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
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
On 01.06.2008 08:21, Greg Beaver wrote: cellog Sun Jun 1 04:21:27 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/phar/tests/files openssl.phar openssl.phar.pubkey private.pem Modified files: Valgrind has found several problems in phar_setsignaturealgo2.phpt: ==10190== Use of uninitialised value of size 8 ==10190==at 0x650931: phar_hex_str (phar.c:498) ==10190==by 0x659706: phar_flush (phar.c:3016) ==10190==by 0x664B5E: zim_Phar_setSignatureAlgorithm (phar_object.c:2727) ==10190==by 0x8EDD02: zend_do_fcall_common_helper_SPEC (zend_vm_execute.h:194) ==10190==by 0x8EEB0B: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (zend_vm_execute.h:295) ==10190==by 0x8ED5BD: execute (zend_vm_execute.h:96) ==10190==by 0x8BE54D: zend_execute_scripts (zend.c:1195) ==10190==by 0x8485D6: php_execute_script (main.c:2080) ==10190==by 0x95FABD: main (php_cli.c:1139) ==10190== ==10190== Use of uninitialised value of size 8 ==10190==at 0x650965: phar_hex_str (phar.c:499) ==10190==by 0x659706: phar_flush (phar.c:3016) ==10190==by 0x664B5E: zim_Phar_setSignatureAlgorithm (phar_object.c:2727) ==10190==by 0x8EDD02: zend_do_fcall_common_helper_SPEC (zend_vm_execute.h:194) ==10190==by 0x8EEB0B: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (zend_vm_execute.h:295) ==10190==by 0x8ED5BD: execute (zend_vm_execute.h:96) ==10190==by 0x8BE54D: zend_execute_scripts (zend.c:1195) ==10190==by 0x8485D6: php_execute_script (main.c:2080) ==10190==by 0x95FABD: main (php_cli.c:1139) ==10190== ==10190== Syscall param write(buf) points to uninitialised byte(s) ==10190==at 0x8646280: __write_nocancel (in /lib64/libc-2.5.so) ==10190==by 0x86A8E2: php_stdiop_write (plain_wrapper.c:312) ==10190==by 0x862C34: _php_stream_write_buffer (streams.c:932) ==10190==by 0x862F29: _php_stream_write (streams.c:1043) ==10190==by 0x65972E: phar_flush (phar.c:3017) ==10190==by 0x664B5E: zim_Phar_setSignatureAlgorithm (phar_object.c:2727) ==10190==by 0x8EDD02: zend_do_fcall_common_helper_SPEC (zend_vm_execute.h:194) ==10190==by 0x8EEB0B: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (zend_vm_execute.h:295) ==10190==by 0x8ED5BD: execute (zend_vm_execute.h:96) ==10190==by 0x8BE54D: zend_execute_scripts (zend.c:1195) ==10190==by 0x8485D6: php_execute_script (main.c:2080) ==10190==by 0x95FABD: main (php_cli.c:1139) ==10190== Address 0x8ed3af8 is 0 bytes inside a block of size 129 alloc'd ==10190==at 0x4C22DAB: malloc (vg_replace_malloc.c:207) ==10190==by 0x89922B: _emalloc (zend_alloc.c:2281) ==10190==by 0x6595CD: phar_flush (phar.c:2981) ==10190==by 0x664B5E: zim_Phar_setSignatureAlgorithm (phar_object.c:2727) ==10190==by 0x8EDD02: zend_do_fcall_common_helper_SPEC (zend_vm_execute.h:194) ==10190==by 0x8EEB0B: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (zend_vm_execute.h:295) ==10190==by 0x8ED5BD: execute (zend_vm_execute.h:96) ==10190==by 0x8BE54D: zend_execute_scripts (zend.c:1195) ==10190==by 0x8485D6: php_execute_script (main.c:2080) ==10190==by 0x95FABD: main (php_cli.c:1139) and test_signaturealgos.phpt: ==10759== Conditional jump or move depends on uninitialised value(s) ==10759==at 0x89946E: safe_address (zend_alloc.c:2348) ==10759==by 0x89940F: _safe_emalloc (zend_alloc.c:2374) ==10759==by 0x6508F1: phar_hex_str (phar.c:495) ==10759==by 0x65196C: phar_parse_pharfile (phar.c:768) ==10759==by 0x6550DA: phar_open_from_fp (phar.c:1566) ==10759==by 0x653E01: phar_create_or_parse_filename (phar.c:1238) ==10759==by 0x653CAB: phar_open_or_create_filename (phar.c:1207) ==10759==by 0x65F594: zim_Phar___construct (phar_object.c:1162) ==10759==by 0x8EDD02: zend_do_fcall_common_helper_SPEC (zend_vm_execute.h:194) ==10759==by 0x8EEB0B: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (zend_vm_execute.h:295) ==10759==by 0x8ED5BD: execute (zend_vm_execute.h:96) ==10759==by 0x8BE54D: zend_execute_scripts (zend.c:1195) ==10759== ==10759== Conditional jump or move depends on uninitialised value(s) ==10759==at 0x65097B: phar_hex_str (phar.c:497) ==10759==by 0x65196C: phar_parse_pharfile (phar.c:768) ==10759==by 0x6550DA: phar_open_from_fp (phar.c:1566) ==10759==by 0x653E01: phar_create_or_parse_filename (phar.c:1238) ==10759==by 0x653CAB: phar_open_or_create_filename (phar.c:1207) ==10759==by 0x65F594: zim_Phar___construct (phar_object.c:1162) ==10759==by 0x8EDD02: zend_do_fcall_common_helper_SPEC (zend_vm_execute.h:194) ==10759==by 0x8EEB0B: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (zend_vm_execute.h:295) ==10759==by 0x8ED5BD: execute (zend_vm_execute.h:96) ==10759==by 0x8BE54D: zend_execute_scripts (zend.c:1195) ==10759==by 0x8485D6: php_execute_script (main.c:2080) ==10759==by 0x95FABD: main (php_cli.c:1139) -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 config.w32 phar.c phar_internal.h phar_object.c zip.c
cellog Sat May 17 20:07:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/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.27.2.2r2=1.27.2.3diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27.2.2 php-src/ext/phar/config.m4:1.27.2.3
--- php-src/ext/phar/config.m4:1.27.2.2 Fri May 16 00:11:42 2008
+++ php-src/ext/phar/config.m4 Sat May 17 20:07:22 2008
@@ -1,15 +1,13 @@
-dnl $Id: config.m4,v 1.27.2.2 2008/05/16 00:11:42 cellog Exp $
+dnl $Id: config.m4,v 1.27.2.3 2008/05/17 20:07:22 cellog Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
-[ --disable-phar Disable phar support], shared)
+[ --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)
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.27.2.1r2=1.27.2.2diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.1
php-src/ext/phar/config.w32:1.27.2.2
--- php-src/ext/phar/config.w32:1.27.2.1Fri May 16 00:01:56 2008
+++ php-src/ext/phar/config.w32 Sat May 17 20:07:22 2008
@@ -1,14 +1,12 @@
-// $Id: config.w32,v 1.27.2.1 2008/05/16 00:01:56 cellog Exp $
+// $Id: config.w32,v 1.27.2.2 2008/05/17 20:07:22 cellog Exp $
// vim:ft=javascript
-ARG_ENABLE(phar, disable phar support, shared);
+ARG_ENABLE(phar, disable phar support, yes);
if (PHP_PHAR != no) {
EXTENSION(phar, dirstream.c func_interceptors.c phar.c phar_object.c
phar_path_check.c stream.c tar.c util.c zip.c);
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.370.2.2r2=1.370.2.3diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.2 php-src/ext/phar/phar.c:1.370.2.3
--- php-src/ext/phar/phar.c:1.370.2.2 Wed May 14 21:29:50 2008
+++ php-src/ext/phar/phar.c Sat May 17 20:07:22 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.2 2008/05/14 21:29:50 sfox Exp $ */
+/* $Id: phar.c,v 1.370.2.3 2008/05/17 20:07:22 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
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 config.w32
cellog Fri May 16 00:01:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar config.m4 config.w32
Log:
as discussed on internals, enable phar by default for testing purposes.
Phar is enabled as a shared extension by default in order to allow zlib/bz2
to be built shared. If phar is statically built,
both zlib and bz2 must be statically built in order for phar to use them, so
default compile as shared is much more flexible
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27r2=1.27.2.1diff_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.27.2.1
--- php-src/ext/phar/config.m4:1.27 Mon Jan 28 08:52:06 2008
+++ php-src/ext/phar/config.m4 Fri May 16 00:01:56 2008
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.27 2008/01/28 08:52:06 cellog Exp $
+dnl $Id: config.m4,v 1.27.2.1 2008/05/16 00:01:56 cellog 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], shared)
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/phar/config.w32?r1=1.27r2=1.27.2.1diff_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.27.2.1
--- php-src/ext/phar/config.w32:1.27Mon Jan 28 14:39:16 2008
+++ php-src/ext/phar/config.w32 Fri May 16 00:01:56 2008
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.27 2008/01/28 14:39:16 sfox Exp $
+// $Id: config.w32,v 1.27.2.1 2008/05/16 00:01:56 cellog Exp $
// vim:ft=javascript
-ARG_ENABLE(phar, enable phar support, no);
+ARG_ENABLE(phar, disable phar support, shared);
if (PHP_PHAR != no) {
EXTENSION(phar, dirstream.c func_interceptors.c phar.c phar_object.c
phar_path_check.c stream.c tar.c util.c zip.c);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
cellog Fri May 16 00:11:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: cosmetics http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.1r2=1.27.2.2diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.1 php-src/ext/phar/config.m4:1.27.2.2 --- php-src/ext/phar/config.m4:1.27.2.1 Fri May 16 00:01:56 2008 +++ php-src/ext/phar/config.m4 Fri May 16 00:11:42 2008 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.27.2.1 2008/05/16 00:01:56 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.2 2008/05/16 00:11:42 cellog Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, -[ --disable-phar Disable phar support], shared) +[ --disable-phar Disable phar support], shared) 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
