Submitted by: covener

Reviewed by: covener, igalic, sf

Merge r1304641 from trunk:

PR52981: mod_request: fix check for bad KeptBodySize argument

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1305012 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 6fda73fcbfe0ea0eebeabdaed767a02c14df2000..afdd2778e5b9e04d8a8a34baa50980874d3bcaa9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/STATUS b/STATUS
index 703cd96bf89731be1072b9c3c79e3006671baeb8..c326009e457d390d22da2027cadb4b34d513e575 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/modules/filters/mod_request.c b/modules/filters/mod_request.c
index ae59ab6329feb556714fee235befcce430702ab3..9cbde0a98815ed562f33b0911d8abfce81a41097 100644 (file)
--- a/modules/filters/mod_request.c
+++ b/modules/filters/mod_request.c
@@ -358,7 +358,7 @@ static const char *set_kept_body_size(cmd_parms *cmd, void *dconf,
     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;