svn commit: r1773162 - /httpd/httpd/trunk/modules/http/http_filters.c

[wr...@apache.org]

Author: wrowe
Date: Wed Dec  7 23:38:47 2016
New Revision: 1773162

URL: http://svn.apache.org/viewvc?rev=1773162&view=rev
Log:
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.


Modified:
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1773162&r1=1773161&r2=1773162&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Wed Dec  7 23:38:47 2016
@@ -660,17 +660,7 @@ static int check_header(void *arg, const
         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 "