Merge r1652982 from trunk:

Fix detection of old Solaris versions.
Autotools need double square brackets.

Submitted by: rjung
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1653963 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 1056bf73dd6ff2cd6c0751ec6e7437f0123760ec..9ba2bd32cfda99eac9d14da1ee20bcfde8e13cd9 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * configure: Fix detection of old Solaris platforms.
-     Autotools need double square brackets.
-     Inspired by checking PR 53824 patch above for consistency.
-     trunk patch: http://svn.apache.org/r1652982
-     2.4.x patch: trunks works
-     +1: rjung, ylavic, wrowe
 
    * mod_ssl: Fix renegotiation failures redirected to an ErrorDocument.
               (segfault flaw) PR 57334.

diff --git a/configure.in b/configure.in
index d2767aebe25d757f56be96f2b565839234bd320f..4380bae126b7530109d36632cf4755ab8382c0c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -332,7 +332,7 @@ case $host in
       dnl solaris 8 and above don't have a thundering herd
       dnl not sure about rev's before this one.
       case `uname -r` in
-        5.[567]*)
+        5.[[567]]*)
             ;;
         * )
             APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])