sixd Wed, 23 Mar 2011 18:56:47 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=309610
Log: Fixed bug #54084 (Fix apxs Apache version test to work with Oracle HTTP Server) (Chris Jones) Bug: http://bugs.php.net/54084 (Open) Fix apxs Apache version test to work with Apache variants Changed paths: U php/php-src/branches/PHP_5_3/acinclude.m4 U php/php-src/trunk/acinclude.m4 Modified: php/php-src/branches/PHP_5_3/acinclude.m4 =================================================================== --- php/php-src/branches/PHP_5_3/acinclude.m4 2011-03-23 17:14:28 UTC (rev 309609) +++ php/php-src/branches/PHP_5_3/acinclude.m4 2011-03-23 18:56:47 UTC (rev 309610) @@ -2591,7 +2591,7 @@ dnl version for apache1/2. dnl AC_DEFUN([PHP_AP_EXTRACT_VERSION],[ - ac_output=`$1 -v 2>&1 | grep version` + ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'` ac_IFS=$IFS IFS="- /. " Modified: php/php-src/trunk/acinclude.m4 =================================================================== --- php/php-src/trunk/acinclude.m4 2011-03-23 17:14:28 UTC (rev 309609) +++ php/php-src/trunk/acinclude.m4 2011-03-23 18:56:47 UTC (rev 309610) @@ -2606,7 +2606,7 @@ dnl version for apache1/2. dnl AC_DEFUN([PHP_AP_EXTRACT_VERSION],[ - ac_output=`$1 -v 2>&1 | grep version` + ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'` ac_IFS=$IFS IFS="- /. "
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
