From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Tue, 18 Oct 2005 03:25:49 +0000 (+0000)
Subject: * modules/generators/config5.m4: Improve Solaris 10 check in mod_cgid to
X-Git-Tag: 2.3.0~2863
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2e9d62353b23d844d3f879bb161fe5bac6846c3;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@326018 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index 4a3c6253ce..51a9ee77fd 100644
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -19,16 +19,34 @@ if ap_mpm_is_threaded; then
       *-solaris2*)
         case `uname -r` in
           5.10)
-          dnl Eventually, 120664 will be released for Solaris 10.
-          dnl At that point, we can do a showrev -p search for that patch.
+          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([mod_cgid is non-functional on Solaris 10.
-This means that threaded MPMs (such as worker MPM) with CGIs will not work.
-This problem is due to an OS bug with AF_UNIX sockets.
-Patches are forthcoming from Sun.
-Please run configure with --disable-cgid or switch to the prefork MPM.
+          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
         ;;