diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2016-12-07 23:40:20 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2016-12-07 23:40:20 +0000 |
| commit | a8bb90548ae38a5df993d52a50d664a653521f03 (patch) | |
| tree | a7d9961ea0adda160118fc26dd0610bc0c5f1a42 | |
| parent | 1919019671390c0c29ecf524d35bcc90b2342ddb (diff) | |
| download | httpd-a8bb90548ae38a5df993d52a50d664a653521f03.tar.gz | |
After eliminating unusual whitespace in Unsafe mode (e.g. \f \v), we are left
with the same behavior in both of these cases. Simplify. Noted by rpluem.
Backports: 1773162
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict@1773163 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/http/http_filters.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index 10bbb995ab..3fefdd3b9e 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -715,17 +715,7 @@ static int check_header(void *arg, const char *name, const char *val) return 0; } - if (ctx->strict) { - test = ap_scan_http_field_content(val); - } - else { - /* Simply terminate scanning on a CTL char, allowing whitespace */ - test = val; - do { - while (*test == ' ' || *test == '\t') test++; - test = ap_scan_vchar_obstext(test); - } while (*test == ' ' || *test == '\t'); - } + test = ap_scan_http_field_content(val); if (*test) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, APLOGNO(02430) "Response header '%s' value of '%s' contains invalid " |