httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1305012 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS modules/filters/mod_request.c
Date Sun, 25 Mar 2012 11:57:13 GMT
Author: covener
Date: Sun Mar 25 11:57:13 2012
New Revision: 1305012

URL: http://svn.apache.org/viewvc?rev=1305012&view=rev
Log:
Submitted by: covener
Reviewed by: covener, igalic, sf

Merge r1304641 from trunk:


PR52981: mod_request: fix check for bad KeptBodySize argument





Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_request.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1305012&r1=1305011&r2=1305012&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Mar 25 11:57:13 2012
@@ -6,6 +6,9 @@ Changes with Apache 2.4.2
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) mod_request: Fix validation of the KeptBodySize argument so it
+     doesn't always throw a configuration error. PR 52981 [Eric Covener]
+
   *) core: Add filesystem paths to access denied / access failed messages
      AH00035 and AH00036. [Eric Covener]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1305012&r1=1305011&r2=1305012&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Mar 25 11:57:13 2012
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_request: PR52981 check apr_stroff error correctly to allow KeptBodySize to be used
-    Trunk patch: http://svn.apache.org/viewvc?rev=1304641&view=rev
-    2.4.x patch: trunk works + CHANGES.
-    +1: covener, igalic, sf
-
   * core: Fix merging of AllowOverrideList and ContentDigest.
     Trunk patch: http://svn.apache.org/viewvc?rev=1304852&view=rev
     2.4.x patch: Trunk patch works

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_request.c?rev=1305012&r1=1305011&r2=1305012&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_request.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_request.c Sun Mar 25 11:57:13 2012
@@ -358,7 +358,7 @@ static const char *set_kept_body_size(cm
     char *end = NULL;
 
     if (APR_SUCCESS != apr_strtoff(&(conf->keep_body), arg, &end, 10)
-            || conf->keep_body < 0 || end) {
+            || conf->keep_body < 0 || *end) {
         return "KeptBodySize must be a valid size in bytes, or zero.";
     }
     conf->keep_body_set = 1;



Mime
View raw message