- updated to 8.3.6

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

diff --git a/php-nohttpd.patch b/php-nohttpd.patch
index 54dcbacf8e88613b717ca72aa858ca6f9436687b..8c5b05b819dd598c0e0b1e2a9e92d6d1a0a14a1a 100644 (file)
--- a/php-nohttpd.patch
+++ b/php-nohttpd.patch
@@ -1,14 +1,11 @@
---- php-5.5.2/sapi/apache2handler/config.m4    2013-08-19 08:41:24.865000066 +0000
-+++ php-5.5.2/sapi/apache2handler/config.m4    2013-08-19 08:46:02.000000068 +0000
-@@ -60,9 +60,9 @@
+--- php-7.4.0alpha3/sapi/apache2handler/config.m4~     2019-07-09 10:39:56.000000000 +0300
++++ php-7.4.0alpha3/sapi/apache2handler/config.m4      2019-07-14 23:54:57.845267916 +0300
+@@ -59,7 +59,7 @@
  
-   # Test that we're trying to configure with apache 2.x
+   dnl 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 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
+-  if test "$APACHE_VERSION" -lt 2000044; then
++  if test "$APACHE_VERSION" -gt 0 -a "$APACHE_VERSION" -lt 2000044; then
      AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
    fi