iliaa Mon Dec 11 14:54:29 2006 UTC
Modified files:
/php-src/sapi/apache2handler php_functions.c
/php-src/sapi/apache2filter php_functions.c
Log:
MFB: Fixed bug #39787 (PHP doesn't work with Apache 2.3).
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_functions.c?r1=1.26&r2=1.27&diff_format=u
Index: php-src/sapi/apache2handler/php_functions.c
diff -u php-src/sapi/apache2handler/php_functions.c:1.26
php-src/sapi/apache2handler/php_functions.c:1.27
--- php-src/sapi/apache2handler/php_functions.c:1.26 Sat Jun 3 11:19:44 2006
+++ php-src/sapi/apache2handler/php_functions.c Mon Dec 11 14:54:29 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.26 2006/06/03 11:19:44 mike Exp $ */
+/* $Id: php_functions.c,v 1.27 2006/12/11 14:54:29 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -333,7 +333,11 @@
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)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_functions.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/sapi/apache2filter/php_functions.c
diff -u php-src/sapi/apache2filter/php_functions.c:1.46
php-src/sapi/apache2filter/php_functions.c:1.47
--- php-src/sapi/apache2filter/php_functions.c:1.46 Sun Jan 1 13:09:57 2006
+++ php-src/sapi/apache2filter/php_functions.c Mon Dec 11 14:54:29 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_functions.c,v 1.46 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php_functions.c,v 1.47 2006/12/11 14:54:29 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -289,7 +289,11 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
