summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--sapi/apache2filter/php_functions.c4
-rw-r--r--sapi/apache2handler/php_functions.c4
3 files changed, 10 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 9dc8e00cff..f7381ce23e 100644
--- 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 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)