httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Sun, 06 Jun 2004 13:23:26 GMT
nd          2004/06/06 06:23:26

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH core.c
  Log:
  Allow LimitRequestBody to be reset to unlimited.
  
  PR: 29106
  Reviewed by: Jeff Trawick, Brad Nicholes, Astrid Keßler
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.294 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.293
  retrieving revision 1.988.2.294
  diff -u -u -r1.988.2.293 -r1.988.2.294
  --- CHANGES	2 Jun 2004 23:10:30 -0000	1.988.2.293
  +++ CHANGES	6 Jun 2004 13:23:25 -0000	1.988.2.294
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) Allow LimitRequestBody to be reset to unlimited. PR 29106
  +     [André Malo]
  +
     *) Fix a bunch of cases where the return code of the regex compiler
        was not checked properly. This affects: mod_setenvif, mod_usertrack,
        mod_proxy, mod_proxy_ftp and core. PR 28218.  [André Malo]
  
  
  
  1.751.2.902 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.901
  retrieving revision 1.751.2.902
  diff -u -u -r1.751.2.901 -r1.751.2.902
  --- STATUS	6 Jun 2004 12:55:44 -0000	1.751.2.901
  +++ STATUS	6 Jun 2004 13:23:26 -0000	1.751.2.902
  @@ -102,11 +102,6 @@
          docs/manual/mod/mod_ldap.xml r1.12
          +1 minfrin, bnicholes
   
  -    *) Allow LimitRequestBody to be reset to unlimited. PR 29106
  -         server/core.c: r1.279
  -       +1: nd, trawick, bnicholes
  -       +1: kess (on concept)
  -
       *) Small fix to allow reverse proxying to an ftp server. Previously
          an attempt to do this would try and connect to 0.0.0.0, regardless
          of the server specified.
  
  
  
  No                   revision
  No                   revision
  1.225.2.22 +10 -2     httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.225.2.21
  retrieving revision 1.225.2.22
  diff -u -u -r1.225.2.21 -r1.225.2.22
  --- core.c	2 Jun 2004 22:40:23 -0000	1.225.2.21
  +++ core.c	6 Jun 2004 13:23:26 -0000	1.225.2.22
  @@ -49,6 +49,10 @@
   #include "mod_proxy.h"
   #include "ap_listen.h"
   
  +/* LimitRequestBody handling */
  +#define AP_LIMIT_REQ_BODY_UNSET         ((apr_off_t) -1)
  +#define AP_DEFAULT_LIMIT_REQ_BODY       ((apr_off_t) 0)
  +
   /* LimitXMLRequestBody handling */
   #define AP_LIMIT_UNSET                  ((long) -1)
   #define AP_DEFAULT_LIMIT_XML_BODY       ((size_t)1000000)
  @@ -114,7 +118,7 @@
       conf->limit_nproc = NULL;
   #endif
   
  -    conf->limit_req_body = 0;
  +    conf->limit_req_body = AP_LIMIT_REQ_BODY_UNSET;
       conf->limit_xml_body = AP_LIMIT_UNSET;
       conf->sec_file = apr_array_make(a, 2, sizeof(ap_conf_vector_t *));
   
  @@ -315,7 +319,7 @@
       }
   #endif
   
  -    if (new->limit_req_body) {
  +    if (new->limit_req_body != AP_LIMIT_REQ_BODY_UNSET) {
           conf->limit_req_body = new->limit_req_body;
       }
   
  @@ -942,6 +946,10 @@
   {
       core_dir_config *d =
         (core_dir_config *)ap_get_module_config(r->per_dir_config, &core_module);
  +
  +    if (d->limit_req_body == AP_LIMIT_REQ_BODY_UNSET) {
  +        return AP_DEFAULT_LIMIT_REQ_BODY;
  +    }
   
       return d->limit_req_body;
   }
  
  
  

Mime
View raw message