From a8bb90548ae38a5df993d52a50d664a653521f03 Mon Sep 17 00:00:00 2001
From: "William A. Rowe Jr" <wrowe@apache.org>
Date: Wed, 7 Dec 2016 23:40:20 +0000
Subject: 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
---
 modules/http/http_filters.c | 12 +-----------
 1 file changed, 1 insertion(+), 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 "
-- 
cgit v1.2.1