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 Tue, 25 May 2004 00:10:25 GMT
nd          2004/05/24 17:10:25

  Modified:    .        CHANGES
               server   core.c
  Log:
  allow LimitRequestBody to be reset to unlimited
  
  PR: 29106
  
  Revision  Changes    Path
  1.1491    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1490
  retrieving revision 1.1491
  diff -u -u -r1.1490 -r1.1491
  --- CHANGES	23 May 2004 22:15:10 -0000	1.1490
  +++ CHANGES	25 May 2004 00:10:25 -0000	1.1491
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Allow LimitRequestBody to be reset to unlimited. PR 29106
  +     [André Malo]
  +
     *) Fix a segfault when requests for shared memory fails and returns
        NULL. Fix a segfault caused by a lack of bounds checking on the
        cache. PR 24801 [Graham Leggett]
  
  
  
  1.279     +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.278
  retrieving revision 1.279
  diff -u -u -r1.278 -r1.279
  --- core.c	24 May 2004 22:55:08 -0000	1.278
  +++ core.c	25 May 2004 00:10:25 -0000	1.279
  @@ -48,6 +48,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)
  @@ -124,7 +128,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 *));
   
  @@ -321,7 +325,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;
       }
   
  @@ -952,6 +956,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