helly Tue Nov 4 14:04:30 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c Log: - MFH We only rely on hash if it is built-in http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.53&r2=1.370.2.54&diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.53 php-src/ext/phar/phar.c:1.370.2.54 --- php-src/ext/phar/phar.c:1.370.2.53 Tue Nov 4 13:33:15 2008 +++ php-src/ext/phar/phar.c Tue Nov 4 14:04:29 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: phar.c,v 1.370.2.53 2008/11/04 13:33:15 helly Exp $ */ +/* $Id: phar.c,v 1.370.2.54 2008/11/04 14:04:29 helly Exp $ */ #define PHAR_MAIN 1 #include "phar_internal.h" @@ -3624,7 +3624,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.53 $"); + php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.54 $"); 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"); @@ -3671,7 +3671,7 @@ ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") -#if HAVE_HASH +#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH) ZEND_MOD_REQUIRED("hash") #endif #if HAVE_SPL
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php