ID: 40010
User updated by: prlw1 at cam dot ac dot uk
Reported By: prlw1 at cam dot ac dot uk
Status: Open
Bug Type: Apache2 related
Operating System: all
PHP Version: 6CVS-2007-01-03 (CVS)
New Comment:
Just to make it obvious, here is the fix:
Note, thanks to the interesting web interface, ^I means
ascii 9 tab throughout...
Index: apache2filter/php_functions.c
===================================================================
RCS file: /repository/php-src/sapi/apache2filter/php_functions.c,v
retrieving revision 1.48
diff -u -r1.48 php_functions.c
--- apache2filter/php_functions.c^I1 Jan 2007 09:29:36 -0000^I1.48
+++ apache2filter/php_functions.c^I3 Jan 2007 18:29:09 -0000
@@ -289,7 +289,7 @@
static char *php_apache_get_version()
{
-#if MODULE_MAGIC_NUMBER_MAJOR >= 20070905
+#if MODULE_MAGIC_NUMBER_MAJOR >= 20060905
^Ireturn (char *) ap_get_server_banner();
#else
^Ireturn (char *) ap_get_server_version();
Index: apache2handler/php_functions.c
===================================================================
RCS file: /repository/php-src/sapi/apache2handler/php_functions.c,v
retrieving revision 1.28
diff -u -r1.28 php_functions.c
--- apache2handler/php_functions.c^I1 Jan 2007 09:29:36 -0000^I1.28
+++ apache2handler/php_functions.c^I3 Jan 2007 18:29:10 -0000
@@ -333,7 +333,7 @@
static char *php_apache_get_version()
{
-#if MODULE_MAGIC_NUMBER_MAJOR >= 20070905
+#if MODULE_MAGIC_NUMBER_MAJOR >= 20060905
^Ireturn (char *) ap_get_server_banner();
#else
^Ireturn (char *) ap_get_server_version();
Previous Comments:
------------------------------------------------------------------------
[2007-01-03 12:19:36] prlw1 at cam dot ac dot uk
Description:
------------
Sadly bug 39787 should be reopened, as bumping the copyright year
has changed the MODULE_MAGIC_NUMBER_MAJOR, breaking the patch.
e.g., try
cvs diff -r1.47 -r1.48 -u sapi/apache2filter/php_functions.c
(same for sapi/apache2handler/php_functions.c)
At least, it is fixed for the apache 2 versions which will be released
after September 2007!
------------------------------------------------------------------------
--
Edit this bug report at http://bugs.php.net/?id=40010&edit=1
