derick Mon Aug 23 05:00:09 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/sapi/apache2filter config.m4
/php-src/sapi/apache2handler config.m4
Log:
- Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Patch by Joe Orton)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.50&r2=1.1760.2.51&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.50 php-src/NEWS:1.1760.2.51
--- php-src/NEWS:1.1760.2.50 Sat Aug 21 10:11:56 2004
+++ php-src/NEWS Mon Aug 23 05:00:07 2004
@@ -3,6 +3,7 @@
?? ??? 2004, PHP 5.0.2
- Added PHP_EOL constant that contains the OS way of representing newlines.
(Paul Hudson, Derick)
+- Fixed Apache 2.0 SAPI build against Apache 2 HEAD. (Joe Orton, Derick)
- Fixed bug with raw_post_data not getting set (Brian)
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
- Fixed bug #29737 (ip2long should return -1 if IP is 255.255.255.255 and FALSE
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/config.m4?r1=1.36&r2=1.36.2.1&ty=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.36
php-src/sapi/apache2filter/config.m4:1.36.2.1
--- php-src/sapi/apache2filter/config.m4:1.36 Fri Oct 3 01:24:27 2003
+++ php-src/sapi/apache2filter/config.m4 Mon Aug 23 05:00:09 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.36 2003/10/03 05:24:27 sniper Exp $
+dnl $Id: config.m4,v 1.36.2.1 2004/08/23 09:00:09 derick Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -40,8 +40,14 @@
APU_BINDIR=`$APXS -q APU_BINDIR`
APR_BINDIR=`$APXS -q APR_BINDIR`
- APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
- APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
+ # Pick up ap[ru]-N-config if using httpd >=2.1
+ APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+ echo $APR_BINDIR/apr-config`
+ APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+ echo $APU_BINDIR/apu-config`
+
+ APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+ APU_CFLAGS="`$APU_CONFIG --includes`"
for flag in $APXS_CFLAGS; do
case $flag in
@@ -49,7 +55,7 @@
esac
done
- APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/config.m4?r1=1.9&r2=1.9.2.1&ty=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.9
php-src/sapi/apache2handler/config.m4:1.9.2.1
--- php-src/sapi/apache2handler/config.m4:1.9 Tue Oct 21 07:48:31 2003
+++ php-src/sapi/apache2handler/config.m4 Mon Aug 23 05:00:09 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.9 2003/10/21 11:48:31 sniper Exp $
+dnl $Id: config.m4,v 1.9.2.1 2004/08/23 09:00:09 derick Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -39,8 +39,14 @@
APU_BINDIR=`$APXS -q APU_BINDIR`
APR_BINDIR=`$APXS -q APR_BINDIR`
- APU_INCLUDEDIR="`$APU_BINDIR/apu-config --includes`"
- APR_INCLUDEDIR="`$APR_BINDIR/apr-config --includes`"
+ # Pick up ap[ru]-N-config if using httpd >=2.1
+ APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+ echo $APR_BINDIR/apr-config`
+ APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+ echo $APU_BINDIR/apu-config`
+
+ APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+ APU_CFLAGS="`$APU_CONFIG --includes`"
for flag in $APXS_CFLAGS; do
case $flag in
@@ -48,7 +54,7 @@
esac
done
- APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APU_INCLUDEDIR $APR_INCLUDEDIR"
+ APACHE_CFLAGS="$APACHE_CPPFLAGS -I$APXS_INCLUDEDIR $APR_CFLAGS $APU_CFLAGS"
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
