| Index: branches/wikia/google-analytics/squid-ga.patch |
| — | — | @@ -1,6 +1,6 @@ |
| 2 | | -+++ squid-2.6.STABLE14/src/http.c 2007-09-05 15:41:14.000000000 +0000 |
| 3 | | -@@ -387,14 +387,48 @@ |
| | 2 | +--- src/http.c.orig 2007-09-26 15:42:22.000000000 +0000 |
| | 3 | +@@ -387,14 +387,49 @@ |
| 4 | 4 | } |
| 5 | 5 | strListAdd(&vstr, name, ','); |
| 6 | 6 | hdr = httpHeaderGetByName(&request->header, name); |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | + if (strListGetItem(&cookieitem, '=', &cookiename, &cookienamelen, &cookienamepos)) { |
| 26 | 26 | + char *cn = xmalloc(cookienamelen + 1); |
| 27 | 27 | + xstrncpy(cn, cookiename, cookienamelen + 1); |
| 28 | | -+ if (strcmp(cn, "__utma") && strcmp(cn, "__utmb") && strcmp(cn, "__utmc") && strcmp(cn, "__utmv") && strcmp(cn, "__utmz")) { |
| | 28 | ++ if (strncmp(cn, "__utm", 5)) { |
| 29 | 29 | + stringAppend(&newhdr, strBuf(cookieitem), strlen(strBuf(cookieitem))); |
| 30 | 30 | + debug(11,3) ("cookie accepted = {%s}\n", cn); |
| 31 | 31 | + } else { |
| — | — | @@ -43,6 +43,7 @@ |
| 44 | 44 | + stringAppend(&vstr, value, strlen(value)); |
| 45 | 45 | + stringAppend(&vstr, "\"", 1); |
| 46 | 46 | + } |
| | 47 | ++ stringClean(&newhdr); |
| 47 | 48 | + } else { |
| 48 | 49 | + value = rfc1738_escape_part(value); |
| 49 | 50 | + stringAppend(&vstr, "=\"", 2); |
| — | — | @@ -54,7 +55,7 @@ |
| 55 | 56 | stringClean(&hdr); |
| 56 | 57 | } |
| 57 | 58 | safe_free(request->vary_hdr); |
| 58 | | -@@ -403,7 +437,8 @@ |
| | 59 | +@@ -403,7 +438,8 @@ |
| 59 | 60 | request->vary_hdr = xstrdup(strBuf(vary)); |
| 60 | 61 | request->vary_headers = xstrdup(strBuf(vstr)); |
| 61 | 62 | } |