#41531 [Asn->Csd]: [PATCH] apache and apache_hooks config.w32 incorrect
ID: 41531
Updated by: auroraeosrose@php.net
Reported By: auroraeosrose at gmail dot com
-Status: Assigned
+Status: Closed
Bug Type: Apache related
Operating System: WinXPSP2
PHP Version: 5CVS-2007-05-29 (snap)
Assigned To: edink
New Comment:
This bug has been fixed in CVS.
Snapshots of the sources are packaged every three hours; this change
will be in the next snapshot. You can grab the snapshot at
http://snaps.php.net/.
Thank you for the report, and for helping us make PHP better.
Previous Comments:
------------------------------------------------------------------------
[2008-04-12 16:39:03] revos27 at gmail dot com
loha sabang sampe merauke indonesia tetap satu tak
akan satupun mampu melumpuhkan kami
------------------------------------------------------------------------
[2007-05-31 14:11:26] auroraeosrose at gmail dot com
bugs.php.net needs a real patch system - here's a link to the patch
hthttp://perisama.net/patches/bug-41531.patch
------------------------------------------------------------------------
[2007-05-30 02:26:09] auroraeosrose at gmail dot com
Second part of that patch has an error, sorry
Index: apache_hooks/config.w32
===================================================================
RCS file: /repository/php-src/sapi/apache_hooks/config.w32,v
retrieving revision 1.2
diff -u -r1.2 config.w32
--- apache_hooks/config.w32 17 Jan 2004 13:00:08 -0000 1.2
+++ apache_hooks/config.w32 30 May 2007 02:20:28 -0000
@@ -6,10 +6,10 @@
if (PHP_APACHE_HOOKS != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE_HOOKS",
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include") &&
+ ";" + PHP_PHP_BUILD + "\\apache\\src\\include") &&
CHECK_LIB("ApacheCore.lib", "apache_hooks", php_usual_lib_suspects
+
';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ';' + PHP_PHP_BUILD + '\\apache\\src\\corer')) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
------------------------------------------------------------------------
[2007-05-29 19:50:40] auroraeosrose at gmail dot com
Description:
------------
apache and apache_hooks sapis have the location of their libraries
hardcoded using ../php_build instead of using the PHP_PHP_BUILD
variable, so detecting libraries when --with-php-build is used fails -
patches to fix this error below
Reproduce code:
---------------
Index: apache/config.w32
===================================================================
RCS file: /repository/php-src/sapi/apache/config.w32,v
retrieving revision 1.7
diff -u -r1.7 config.w32
--- apache/config.w32 17 Jan 2004 13:00:04 -0000 1.7
+++ apache/config.w32 29 May 2007 19:30:49 -0000
@@ -9,10 +9,10 @@
if (PHP_APACHE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE",
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include") &&
+ ";" + PHP_PHP_BUILD + "\\apache\\src\\include") &&
CHECK_LIB("ApacheCore.lib", "apache", php_usual_lib_suspects +
';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ';' + PHP_PHP_BUILD + '\\apache\\src\\corer')) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache', 'mod_php5.c sapi_apache.c php_apache.c',
Index: apache_hooks/config.w32
===================================================================
RCS file: /repository/php-src/sapi/apache_hooks/config.w32,v
retrieving revision 1.2
diff -u -r1.2 config.w32
--- apache_hooks/config.w32 17 Jan 2004 13:00:08 -0000 1.2
+++ apache_hooks/config.w32 29 May 2007 19:42:45 -0000
@@ -6,10 +6,10 @@
if (PHP_APACHE_HOOKS != "no") {
if (CHECK_HEADER_ADD_INCLUDE("httpd.h", "CFLAGS_APACHE_HOOKS",
php_usual_include_suspects +
";" + PROGRAM_FILES + "\\Apache Group\\Apache\\include" +
- ";..\\php_build\\apache\\src\\include") &&
+ ";" + PHP_PHP_BUILD + "\\php_build\\apache\\src\\include") &&
CHECK_LIB("ApacheCore.lib", "apache_hooks", php_usual_lib_suspects
+
';' + PROGRAM_FILES + '\\Apache Group\\Apache\\libexec' +
- ';..\\php_build\\apache\\src\\corer')) {
+ ';' + PHP_PHP_BUILD + '\\apache\\src\\corer')) {
// We need to play tricks to get our readdir.h used by apache
// headers
SAPI('apache_hooks', 'mod_php5.c sapi_apache.c php_apache.c',
------------------------------------------------------------------------
--
Edit this bug report at http://bugs.php.net/?id=41531&edit=1
Thread (6 messages)