From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 29 Jul 2016 20:22:37 +0000 (+0000)
Subject: Correct usage for ap_scan_http_token (had used _get_ syntax), noted by Rüdiger
X-Git-Tag: 2.5.0-alpha~1353
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e1efad0878d573bed5dda742fb77f59a6d22726;p=thirdparty%2Fapache%2Fhttpd.git

Correct usage for ap_scan_http_token (had used _get_ syntax), noted by Rüdiger

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1754570 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index 3e8b787a352..cef75175ba3 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -945,8 +945,8 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb
                 else /* Using strict RFC7230 parsing */
                 {
                     /* Ensure valid token chars before ':' per RFC 7230 3.2.4 */
-                    if (!(value = (char *)ap_scan_http_token(last_field))
-                            || *value != ':') {
+                    value = (char *)ap_scan_http_token(last_field);
+                    if ((value > last_field) || *value != ':') {
                         r->status = HTTP_BAD_REQUEST;
                         apr_table_setn(r->notes, "error-notes",
                             apr_psprintf(r->pool,