X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-nohttpd.patch;h=8a68bc7eb26cd434a7220611ff7fc3e9e8447f19;hb=712278527b67351baf8b4b873b489c19d491b6ab;hp=dcaafc4107d31b868d5a25741b2bdafa912c8b9b;hpb=47130bb86ff82df6ba9ec83597ffeacabc1d888a;p=packages%2Fphp.git diff --git a/php-nohttpd.patch b/php-nohttpd.patch index dcaafc4..8a68bc7 100644 --- a/php-nohttpd.patch +++ b/php-nohttpd.patch @@ -1,13 +1,12 @@ -diff -urBb php-5.1.0RC1.org/sapi/apache2handler/config.m4 php-5.1.0RC1/sapi/apache2handler/config.m4 ---- php-5.1.0RC1.org/sapi/apache2handler/config.m4 2005-08-05 10:14:54.000000000 +0200 -+++ php-5.1.0RC1/sapi/apache2handler/config.m4 2005-08-25 15:09:38.486655320 +0200 -@@ -58,9 +58,9 @@ +--- php-5.5.2/sapi/apache2handler/config.m4~ 2013-08-15 23:42:04.000000000 +0300 ++++ php-5.5.2/sapi/apache2handler/config.m4 2013-08-18 15:13:02.728903161 +0300 +@@ -60,9 +60,9 @@ # Test that we're trying to configure with apache 2.x PHP_AP_EXTRACT_VERSION($APXS_HTTPD) - if test "$APACHE_VERSION" -le 2000000; then + if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -le 2000000; then - AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)]) + AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)]) - elif test "$APACHE_VERSION" -lt 2000044; then + elif test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])