diff options
| author | Iliya Ivanov | 2019-04-08 18:39:02 +0300 |
|---|---|---|
| committer | Iliya Ivanov | 2019-04-08 18:39:02 +0300 |
| commit | 78b3f84ac93dd42821d7e033ad16b03e14d95584 (patch) | |
| tree | a93ef605316d0a3744ef1d97b3e5c014c3907d13 /apache.patch | |
| parent | 222df2bee7f241b970690d3bd9984b3ee53656f6 (diff) | |
| download | aur-78b3f84ac93dd42821d7e033ad16b03e14d95584.tar.gz | |
Update to PHP 7.3.4 & allow multicore compilation
Diffstat (limited to 'apache.patch')
| -rw-r--r-- | apache.patch | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/apache.patch b/apache.patch index c2e64d950295..3e5f90978311 100644 --- a/apache.patch +++ b/apache.patch @@ -1,10 +1,21 @@ --- sapi/apache2handler/config.m4.orig +++ sapi/apache2handler/config.m4 -@@ -113,7 +113,6 @@ - PHP_BUILD_THREAD_SAFE - fi - else +@@ -107,17 +107,7 @@ + ;; + 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 +- if test -n "$APACHE_THREADED_MPM"; then +- PHP_BUILD_THREAD_SAFE +- fi +- fi ++PHP_BUILD_THREAD_SAFE + AC_MSG_RESULT(yes) + PHP_SUBST(APXS) + else |