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

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 10bbb995abec87b565814888561d74f07de6cb61..3fefdd3b9e279c352da34288d9c7cdc766355cfa 100644 (file)
--- 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 "