From 13fdf81888716bbc92500a8270ecb1d466529c06 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sun, 25 Mar 2012 11:57:13 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ STATUS | 5 ----- modules/filters/mod_request.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 6fda73fcbf..afdd2778e5 100644 --- 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 703cd96bf8..c326009e45 100644 --- 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 ae59ab6329..9cbde0a988 100644 --- 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; -- 2.40.0