Fix the ulimit command used by apachectl on Tru64.

PR:           13609
Submitted by: Joseph Senulis <Joseph.Senulis@dnr.state.wi.us>, Jeff Trawick]

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

diff --git a/CHANGES b/CHANGES
index c30f776a982199d574c06a037d0f47eaf108da16..d29cf47e4985cd98263d89e2eabf00f26efeb8f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Fix the ulimit command used by apachectl on Tru64.  PR 13609.
+     [Joseph Senulis <Joseph.Senulis@dnr.state.wi.us>, Jeff Trawick]
+
   *) Add mod_authz_owner - a forward port of "Require file-owner"
      and "Require file-group", which was already present in version
      1.3.21.  [André Malo]

diff --git a/support/config.m4 b/support/config.m4
index 1fe2889dab8441eb1c53b0df716c8565435a8449..dcc99f440915be5ca5274753a898c08cb9a1b45d 100644 (file)
--- a/support/config.m4
+++ b/support/config.m4
@@ -83,12 +83,16 @@ APACHE_SUBST(checkgid_LTFLAGS)
 
 case $host in
     *aix*)
-        # this works in any locale, unlike the command below, which
+        # this works in any locale, unlike the default command below, which
         # fails in a non-English locale if the hard limit is unlimited
         # since the display of the limit will translate "unlimited", but
        # ulimit only accepts English "unlimited" on input
         APACHECTL_ULIMIT="ulimit -S -n unlimited"
         ;;
+    *alpha*-dec-osf*)
+        # Tru64: -H is for setting, not retrieving
+        APACHECTL_ULIMIT="ulimit -S -n \`ulimit -h -n\`"
+        ;;
     *)
         if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT ; then
             APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"