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

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 63a9aafe35b62b8b9c11e5eb023a30a3576fe721..ef9b0e93233d3381e60caa708c8fafa8b6674491 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)