cvs: php-src(PHP_5_2) / NEWS /sapi/apache2filter php_functions.c /sapi/apache2handler php_functions.c

iliaa Mon Dec 11 14:54:15 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/apache2handler php_functions.c /php-src/sapi/apache2filter php_functions.c /php-src NEWS Log: Fixed bug #39787 (PHP doesn't work with Apache 2.3). http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.18.2.6&r2=1.18.2.6.2.1&diff_format=u Index: php-src/sapi/apache2handler/php_functions.c diff -u php-src/sapi/apache2handler/php_functions.c:1.18.2.6 php-src/sapi/apache2handler/php_functions.c:1.18.2.6.2.1 --- php-src/sapi/apache2handler/php_functions.c:1.18.2.6 Tue Jan 3 20:13:07 2006 +++ php-src/sapi/apache2handler/php_functions.c Mon Dec 11 14:54:14 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.18.2.6 2006/01/03 20:13:07 iliaa Exp $ */ +/* $Id: php_functions.c,v 1.18.2.6.2.1 2006/12/11 14:54:14 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -333,7 +333,11 @@ static char *php_apache_get_version() { +#if MODULE_MAGIC_NUMBER_MAJOR >= 20060905 + return (char *) ap_get_server_banner(); +#else return (char *) ap_get_server_version(); +#endif } /* {{{ proto string apache_get_version(void) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.44.2.2&r2=1.44.2.2.2.1&diff_format=u Index: php-src/sapi/apache2filter/php_functions.c diff -u php-src/sapi/apache2filter/php_functions.c:1.44.2.2 php-src/sapi/apache2filter/php_functions.c:1.44.2.2.2.1 --- php-src/sapi/apache2filter/php_functions.c:1.44.2.2 Sun Jan 1 12:50:18 2006 +++ php-src/sapi/apache2filter/php_functions.c Mon Dec 11 14:54:14 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_functions.c,v 1.44.2.2 2006/01/01 12:50:18 sniper Exp $ */ +/* $Id: php_functions.c,v 1.44.2.2.2.1 2006/12/11 14:54:14 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -289,7 +289,11 @@ static char *php_apache_get_version() { +#if MODULE_MAGIC_NUMBER_MAJOR >= 20060905 + return (char *) ap_get_server_banner(); +#else return (char *) ap_get_server_version(); +#endif } /* {{{ proto string apache_get_version(void) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.423&r2=1.2027.2.547.2.424&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.423 php-src/NEWS:1.2027.2.547.2.424 --- php-src/NEWS:1.2027.2.547.2.423 Mon Dec 11 05:04:36 2006 +++ php-src/NEWS Mon Dec 11 14:54:14 2006 @@ -52,6 +52,8 @@ - Added optimization for imageline with horizontal and vertial lines (Pierre) - Fixed bug #39791 (Crash in strtotime() on overly long relative date multipliers). (Ilia) +- Fixed bug #39787 (PHP doesn't work with Apache 2.3). (mv at binarysec dot + com). - Fixed bug #39780 (PNG image with CRC/data error raises fatal error) (Pierre) - Fixed bug #39775 ("Indirect modification ..." message is not shown). (Dmitry) - Fixed bug #39763 (magic quotes are applied twice by ext/filter in