Merge r264866 and r326018 from trunk:

 * mod_cgid: Refuse to work on Solaris 10 due to OS bugs.

 * modules/generators/config5.m4: Improve Solaris 10 check in mod_cgid to
   know about the now-released patches that fix the AF_UNIX bugs.

PR: 34264

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

diff --git a/CHANGES b/CHANGES
index ed78d4d6eb375b58bbaa4e36b60ec07dbdd44fcf..92eaa8e9870c6d82b70b1fdc2cdb1474b59a21aa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
+  *) mod_cgid: Refuse to work on Solaris 10 due to OS bugs.  PR 34264.
+     [Justin Erenkrantz]
+
   *) mod_cache: Correctly handle responses with a 301 status. PR 37347. 
      [Paul Querna]
 

diff --git a/STATUS b/STATUS
index 7127fcf6f0e69e89caa48d7670f62ea94964b404..19a17fd20828d293967846873b7484fa02456cd2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -124,20 +124,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs?view=rev&rev=154319
        +1: stoddard, striker, wrowe (as corrected in subsequent patches)
 
-    *) Block mod_cgid usage on Solaris 10 due to OS bugs.  PR 34264.
-       http://svn.apache.org/viewcvs?view=rev&rev=264866
-       +1: jerenkrantz, colm, jim
-         rpluem: Now that patches for this bug are available I would prefer
-                 Justins patch:
-                         http://svn.apache.org/viewcvs?rev=326018&view=rev
-                 which checks the patchlevel of the machine.
-                 Maybe it should spit out a BIG warning about the
-                 patches in any case as sometimes build machine and
-                 install machine are different.
-         jim:    +1 on http://svn.apache.org/viewcvs?rev=326018&view=rev
-                 as well.
-         colm:   another +1 on the later patch too.
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index 7113018226e51057d30d6164f03c604283fc1491..f4afb7f18d0fa3bd2e09de35267d6ea3898fda79 100644 (file)
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -16,7 +16,44 @@ APR_ADDTO(LT_LDFLAGS,-export-dynamic)
 if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
 # if we are using a threaded MPM, we will get better performance with
 # mod_cgid, so make it the default.
-    APACHE_MODULE(cgid, CGI scripts, , , yes)
+    APACHE_MODULE(cgid, CGI scripts, , , yes, [
+    case $host in
+      *-solaris2*)
+        case `uname -r` in
+          5.10)
+          dnl Does the system have the appropriate patches?
+          case `uname -p` in
+            i386)
+              patch_id="120665"
+              ;;
+            sparc)
+              patch_id="120664"
+              ;;
+            *)
+              AC_MSG_WARN([Unknown platform])
+              patch_id="120664"
+              ;;
+          esac
+          AC_MSG_CHECKING([for Solaris patch $patch_id])
+          showrev -p | grep "$patch_id" >/dev/null 2>&1
+          if test $? -eq 1; then
+          dnl Solaris 11 (next release) as of snv_19 doesn't have this problem.
+          dnl It may be possible to use /kernel/drv/tl from later releases.
+          AC_MSG_ERROR([Please apply either patch # 120664 (Sparc) or # 120665 (x86).
+Without these patches, mod_cgid is non-functional on Solaris 10 due to an OS
+bug with AF_UNIX sockets.
+If you can not apply these patches, you can do one of the following:
+ - run configure with --disable-cgid
+ - switch to the prefork MPM
+For more info: <http://issues.apache.org/bugzilla/show_bug.cgi?id=34264>])
+          else
+            AC_MSG_RESULT(yes)
+          fi
+          ;;
+        esac
+        ;;
+    esac
+  ])
     APACHE_MODULE(cgi, CGI scripts, , , no)
 else
 # if we are using a non-threaded MPM, it makes little sense to use