diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-12-11 14:54:14 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-12-11 14:54:14 +0000 |
| commit | d3aa69526309f444760bb03370e59afb7ed2c390 (patch) | |
| tree | 471f6f5107b7c2bdf568edc5af3d9b98301ebdb1 | |
| parent | ab765ca497b81fd876f9651a3e156358bfd5d5b8 (diff) | |
| download | php-git-d3aa69526309f444760bb03370e59afb7ed2c390.tar.gz | |
Fixed bug #39787 (PHP doesn't work with Apache 2.3).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/php_functions.c | 4 | ||||
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 4 |
3 files changed, 10 insertions, 0 deletions
@@ -52,6 +52,8 @@ PHP NEWS - 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 diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c index e8665fa506..aa9f2b61ca 100644 --- a/sapi/apache2filter/php_functions.c +++ b/sapi/apache2filter/php_functions.c @@ -289,7 +289,11 @@ PHP_FUNCTION(apache_getenv) 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) diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c index 1e9b60abef..2e3db4c1fe 100644 --- a/sapi/apache2handler/php_functions.c +++ b/sapi/apache2handler/php_functions.c @@ -333,7 +333,11 @@ PHP_FUNCTION(apache_getenv) 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) |