From 7c76192fc9f86d6b163ef5fccb60ee6cf33ccc89 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Jul 2019 11:03:24 +0200 Subject: - update to 7.4.0alpha3 - drop argon2 dependency using libsodium implementation --- php-7.1.7-httpd.patch | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 php-7.1.7-httpd.patch (limited to 'php-7.1.7-httpd.patch') diff --git a/php-7.1.7-httpd.patch b/php-7.1.7-httpd.patch deleted file mode 100644 index acb3d2c..0000000 --- a/php-7.1.7-httpd.patch +++ /dev/null @@ -1,28 +0,0 @@ -Disable MPM detection - -mod_php is build twice -- as NTS without option -- as ZTS using --enable-maintainer-zts - -diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 -index 2e64b21..ec4799f 100644 ---- a/sapi/apache2handler/config.m4 -+++ b/sapi/apache2handler/config.m4 -@@ -116,17 +116,6 @@ if test "$PHP_APXS2" != "no"; then - ;; - esac - -- if test "$APACHE_VERSION" -lt 2004001; then -- APXS_MPM=`$APXS -q MPM_NAME` -- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then -- PHP_BUILD_THREAD_SAFE -- fi -- else -- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` -- if test -n "$APACHE_THREADED_MPM"; then -- PHP_BUILD_THREAD_SAFE -- fi -- fi - AC_MSG_RESULT(yes) - PHP_SUBST(APXS) - else -- cgit