Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6960B200B50 for ; Fri, 29 Jul 2016 22:22:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 68280160A79; Fri, 29 Jul 2016 20:22:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AF9F0160A6E for ; Fri, 29 Jul 2016 22:22:40 +0200 (CEST) Received: (qmail 36869 invoked by uid 500); 29 Jul 2016 20:22:39 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 36860 invoked by uid 99); 29 Jul 2016 20:22:39 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jul 2016 20:22:39 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 7C0871A5825 for ; Fri, 29 Jul 2016 20:22:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.426 X-Spam-Level: X-Spam-Status: No, score=-0.426 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id A22WAQv-z0R5 for ; Fri, 29 Jul 2016 20:22:39 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id B69105F19B for ; Fri, 29 Jul 2016 20:22:38 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 1681AE04BA for ; Fri, 29 Jul 2016 20:22:37 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id CF5BC3A1048 for ; Fri, 29 Jul 2016 20:22:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1754570 - /httpd/httpd/trunk/server/protocol.c Date: Fri, 29 Jul 2016 20:22:37 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160729202237.CF5BC3A1048@svn01-us-west.apache.org> archived-at: Fri, 29 Jul 2016 20:22:41 -0000 Author: wrowe Date: Fri Jul 29 20:22:37 2016 New Revision: 1754570 URL: http://svn.apache.org/viewvc?rev=1754570&view=rev Log: Correct usage for ap_scan_http_token (had used _get_ syntax), noted by Rüdiger Modified: httpd/httpd/trunk/server/protocol.c Modified: httpd/httpd/trunk/server/protocol.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1754570&r1=1754569&r2=1754570&view=diff ============================================================================== --- httpd/httpd/trunk/server/protocol.c (original) +++ httpd/httpd/trunk/server/protocol.c Fri Jul 29 20:22:37 2016 @@ -945,8 +945,8 @@ AP_DECLARE(void) ap_get_mime_headers_cor 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,