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
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]
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
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;