From 3644cc61112e48321a93d2afb455c225b8150f30 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 5 Oct 2017 17:55:29 +0200 Subject: [PATCH] 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. --- configure.ac | 11 +---------- ext/opcache/ZendAccelerator.c | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index a63354f296..6ba8b798bf 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 <