add two fixes from centos/el. addresses CVE-2011-4153 CVE-2014-2270

[packages/php.git] / php-stupidapache_version.patch

diff --git a/php-stupidapache_version.patch b/php-stupidapache_version.patch
index d27411707fc4e45623b5cc0700b989226d8af2e0..f2478a4400a1fe5250a7ae43da5f51f3b3439f23 100644 (file)
--- a/php-stupidapache_version.patch
+++ b/php-stupidapache_version.patch
@@ -4,11 +4,11 @@
  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-//'`
 +  if test "$with_apache_version" != "no"; then
 +    ac_output="foo bar baz $with_apache_version"
 +  else
-+    ac_output=`$1 -v 2>&1 | grep version`
++    ac_output=`$1 -v 2>&1 | grep version | $SED -e 's/Oracle-HTTP-//'`
 +  fi
    ac_IFS=$IFS
  IFS="- /.