diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-07-07 12:10:59 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-07-07 12:10:59 +0200 |
| commit | 35709b56e4124b35d6b9fd307517d255af8303bb (patch) | |
| tree | 6d1e6fcdcfd4f6a6262fb1305a1e54bf49602d41 /sapi/apache2handler | |
| parent | e89cbfc1c946dda747e72f08504ac5d06c8966b7 (diff) | |
| parent | 49cc2a63b31f9b749f1fb3b26f568ad87c3ff17d (diff) | |
| download | php-git-35709b56e4124b35d6b9fd307517d255af8303bb.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove some more Apache 1 left overs
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/config.m4 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 9b70ad3a47..67c6d9beea 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -1,11 +1,11 @@ PHP_ARG_WITH([apxs2],, [AS_HELP_STRING([[--with-apxs2[=FILE]]], - [Build shared Apache 2.0 Handler module. FILE is the optional pathname to + [Build shared Apache 2 handler module. FILE is the optional pathname to the Apache apxs tool [apxs]])], [no], [no]) -AC_MSG_CHECKING([for Apache 2.0 handler-module support via DSO through APXS]) +AC_MSG_CHECKING([for Apache 2 handler module support via DSO through APXS]) if test "$PHP_APXS2" != "no"; then if test "$PHP_APXS2" = "yes"; then @@ -59,9 +59,7 @@ if test "$PHP_APXS2" != "no"; then 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 - 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 + if test "$APACHE_VERSION" -lt 2000044; then AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) fi @@ -113,7 +111,7 @@ if test "$PHP_APXS2" != "no"; then PHP_BUILD_THREAD_SAFE fi else - APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` + APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` if test -n "$APACHE_THREADED_MPM"; then PHP_BUILD_THREAD_SAFE fi |