httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/support config.m4
Date Tue, 21 Jan 2003 00:41:58 GMT
trawick     2003/01/20 16:41:58

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               support  Tag: APACHE_2_0_BRANCH config.m4
  Log:
  merge a couple of apachectl/ulimit fixes into the stable 2.0 branch
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.19 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.18
  retrieving revision 1.988.2.19
  diff -u -r1.988.2.18 -r1.988.2.19
  --- CHANGES	20 Jan 2003 23:02:45 -0000	1.988.2.18
  +++ CHANGES	21 Jan 2003 00:41:57 -0000	1.988.2.19
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.45
   
  +  *) Fix the ulimit command used by apachectl on Tru64.  PR 13609.
  +     [Joseph Senulis <Joseph.Senulis@dnr.state.wi.us>, Jeff Trawick]
  +
  +  *) Change the ulimit command used by apachectl on AIX so that it
  +     works in all locales.  [Jeff Trawick]
  +
     *) mod_ext_filter: Fix a problem building argument lists which 
        occasionally caused exec to fail.  PR 15491.  [Jeff Trawick]
   
  
  
  
  1.751.2.46 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.45
  retrieving revision 1.751.2.46
  diff -u -r1.751.2.45 -r1.751.2.46
  --- STATUS	20 Jan 2003 23:02:46 -0000	1.751.2.45
  +++ STATUS	21 Jan 2003 00:41:57 -0000	1.751.2.46
  @@ -74,12 +74,6 @@
         -1: brianp (we need a more robust solution than what's in 2.1 right now),
             jerenkrantz (should be fixed, but I don't have time to do this)
   
  -    * Use different ulimit commands in apachectl on Tru64 and AIX.
  -      On both platforms, there are situations where problems with the
  -      default command won't be found at configure time.  The changes
  -      are r1.6 and r1.7 of support/config.m4.
  -      +1: trawick, jerenkrantz, gregames
  -
       * Insure that ap_get_mime_headers passes a null terminated string
         to ap_escape_html if ap_rgetline exits abnormally (e.g. header too long).
         The patch is r1.123 thru r1.125 of server/protocol.c.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +20 -5     httpd-2.0/support/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/config.m4,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- config.m4	14 Jul 2002 23:18:45 -0000	1.5
  +++ config.m4	21 Jan 2003 00:41:58 -0000	1.5.2.1
  @@ -81,9 +81,24 @@
   ])
   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 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\`"
  +        else
  +            APACHECTL_ULIMIT=""
  +        fi
  +        ;;
  +esac
   APACHE_SUBST(APACHECTL_ULIMIT)
  
  
  

Mime
View raw message