From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 11 Dec 2006 14:54:29 +0000 (+0000)
Subject: MFB: Fixed bug #39787 (PHP doesn't work with Apache 2.3).
X-Git-Tag: RELEASE_1_0_0RC1~724
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c151b4a37f27968c246ce5c02a688e933cfdd4e2;p=php

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 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 63a9aafe35..ef9b0e9323 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)