summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2003-01-15 15:32:06 +0100
committerJeff Trawick <trawick@apache.org>2003-01-15 15:32:06 +0100
commit4a13959abc26ace71773014da2ee69e992e4f2b8 (patch)
treeb7876fcfcefe898ebd11caaff86b0bc9373a49b6
parentfix the type of the idlers field to match what apr_atomic_cas() expects (diff)
downloadapache2-4a13959abc26ace71773014da2ee69e992e4f2b8.tar.xz
apache2-4a13959abc26ace71773014da2ee69e992e4f2b8.zip
Change the ulimit command used by apachectl on AIX so that it
works in all locales. the standard command 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98277 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--support/config.m421
1 files changed, 16 insertions, 5 deletions
diff --git a/support/config.m4 b/support/config.m4
index ad52a8c03c..1fe2889dab 100644
--- a/support/config.m4
+++ b/support/config.m4
@@ -81,9 +81,20 @@ fi
])
APACHE_SUBST(checkgid_LTFLAGS)
-if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT ; then
- APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"
-else
- APACHECTL_ULIMIT=""
-fi
+case $host in
+ *aix*)
+ # this works in any locale, unlike the 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"
+ ;;
+ *)
+ if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT ; then
+ APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`"
+ else
+ APACHECTL_ULIMIT=""
+ fi
+ ;;
+esac
APACHE_SUBST(APACHECTL_ULIMIT)