Fixed bug #39787 (PHP doesn't work with Apache 2.3).

diff --git a/NEWS b/NEWS
index 9dc8e00cffa523d2d4897c71ba906f708eda14e8..f7381ce23e01edbbab6799271f82a5553065d4a2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 e8665fa506cc1aafdfe109fa5cedd515a6320c57..aa9f2b61ca4152dc7f119200357d6f716909ee0a 100644 (file)
--- 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 1e9b60abeff59b17e59a16030d69d713be73d72d..2e3db4c1fe350185c029fe29111c850e0b3215fc 100644 (file)
--- 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)