com php-src: Remove some old apache2filter occurrences: configure.ac ext/opcache/ZendAccelerator.c

Commit: 3644cc61112e48321a93d2afb455c225b8150f30 Author: Peter Kokot <peterkokot@gmail.com> Thu, 5 Oct 2017 17:55:29 +0200 Committer: Nikita Popov <nikita.ppv@gmail.com> Sun, 8 Oct 2017 17:48:47 +0200 Parents: 0646042d1f22acaff578c2e4cf6116d75f73aab7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3644cc61112e48321a93d2afb455c225b8150f30 Log: Remove some old apache2filter occurrences apache2filter was supported in PHP <= 5.6. This patch removes some old apache2filter occurrences. Also FreeBSD warning therefore is not needed anymore when building PHP with apache2filter and in later versions don't need to set the --with-tsrm-pth option. Changed paths: M configure.ac M ext/opcache/ZendAccelerator.c Diff: diff --git a/configure.ac b/configure.ac index a63354f..6ba8b79 100644 --- a/configure.ac +++ b/configure.ac @@ -1544,15 +1544,6 @@ dnl mv -f main/internal_functions.c main/internal_functions.c.old 2>/dev/null cli_extensions="$EXT_CLI_STATIC" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in $srcdir "$EXTRA_MODULE_PTRS" $AWK \$cli_extensions > main/internal_functions_cli.c - if test "$UNAME" = "FreeBSD" && test "$PHP_SAPI" = "apache2filter" && test "$TSRM_PTH" != "pth-config" ; then - echo "+--------------------------------------------------------------------+" - echo "| *** WARNING *** |" - echo "| |" - echo "| In order to build PHP as a Apache2 module on FreeBSD, you have to |" - echo "| add --with-tsrm-pth to your ./configure line. Therefore you need |" - echo "| to install gnu-pth from /usr/ports/devel/pth. |" - fi - if test -n "$PHP_APXS_BROKEN"; then echo "+--------------------------------------------------------------------+" echo "| WARNING: Your $APXS script is most likely broken." @@ -1578,7 +1569,7 @@ cat <<X X fi - if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then + if test "$PHP_SAPI" = "apache2handler"; then if test "$APACHE_VERSION" -ge 2004001; then if test -z "$APACHE_THREADED_MPM"; then cat <<X diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index a407c88..78dc603 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2319,7 +2319,6 @@ static inline int accel_find_sapi(void) "cli-server", "cgi-fcgi", "fpm-fcgi", - "apache2filter", "apache2handler", "litespeed", "uwsgi",