File squid-2.6.STABLE20-bug2541-bnc577347.patch of Package squid

Overview Repositories Revisions Requests Users Attributes Meta

File squid-2.6.STABLE20-bug2541-bnc577347.patch of Package squid (Revision 126433d730cb2afa051851fbdf646f37)

Currently displaying revision 126433d730cb2afa051851fbdf646f37 , Show latest

diff -ruN ../squid-2.6.STABLE20.orig/src/HttpHeaderTools.c ./src/HttpHeaderTools.c
--- ../squid-2.6.STABLE20.orig/src/HttpHeaderTools.c	2008-04-02 03:04:20.000000000 +0200
+++ ./src/HttpHeaderTools.c	2010-03-12 17:39:09.000000000 +0100
@@ -239,6 +239,10 @@
 strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos)
 {
     size_t len;
+    /* ',' is always enabled as field delimiter as this is required for
+     * processing merged header values properly, even if Cookie normally
+     * uses ';' as delimiter.
+     */
     static char delim[3][8] =
     {
 	"\"?,",
@@ -261,16 +265,15 @@
     /* find next delimiter */
     do {
 	*pos += strcspn(*pos, delim[quoted]);
-	if (**pos == del)
-	    break;
 	if (**pos == '"') {
 	    quoted = !quoted;
 	    *pos += 1;
-	}
-	if (quoted && **pos == '\\') {
+        } else if (quoted && **pos == '\\') {
 	    *pos += 1;
 	    if (**pos)
 		*pos += 1;
+        } else {
+            break;              /* Delimiter found, marking the end of this value */
 	}
     } while (**pos);
     len = *pos - *item;		/* *pos points to del or '\0' */

Places

File squid-2.6.STABLE20-bug2541-bnc577347.patch of Package squid (Revision 126433d730cb2afa051851fbdf646f37)

Places