From: Jim Jagielski <jim@apache.org>
Date: Tue, 13 May 2008 20:34:00 +0000 (+0000)
Subject: Merge r655714 from trunk:
X-Git-Tag: 2.2.9~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32f65eb68d83986ce1c632d3f4deeab527f0f7fe;p=thirdparty%2Fapache%2Fhttpd.git

Merge r655714 from trunk:

gen_test_char: add double-quote to the list of T_HTTP_TOKEN_STOP.

PR: 9727
Submitted by: Ville Skytt <ville.skytta iki.fi>

Submitted by: fielding
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@656000 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index dc16438a190..2728beaccc6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) gen_test_char: add double-quote to the list of T_HTTP_TOKEN_STOP.
+     PR 9727 [Ville Skytt <ville.skytta iki.fi>]
+
   *) core: reinstate location walk to fix config for subrequests
      PR 41960 [Jose Kahan <jose w3.org>]
 
diff --git a/server/gen_test_char.c b/server/gen_test_char.c
index 587583aed60..59947d5888c 100644
--- a/server/gen_test_char.c
+++ b/server/gen_test_char.c
@@ -90,8 +90,8 @@ int main(int argc, char *argv[])
             flags |= T_OS_ESCAPE_PATH;
         }
 
-        /* these are the "tspecials" from RFC2068 */
-        if (c && (apr_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?={}", c))) {
+        /* these are the "tspecials" (RFC2068) or "separators" (RFC2616) */
+        if (c && (apr_iscntrl(c) || strchr(" \t()<>@,;:\\\"/[]?={}", c))) {
             flags |= T_HTTP_TOKEN_STOP;
         }