Merge lp:~michael.nelson/ubuntu/trusty/squid3/1336742-cache-repsonses-with-vary-headers into lp:ubuntu/trusty/squid3

[Michael Nelson]

This patches the trusty version of squid3 with the upstream patch for "Caching responses with 'Vary' header":

http://bugs.squid-cache.org/show_bug.cgi?id=3806

I'm not proposing that this be included as an SRU in trusty necessarily, but need this in a private repo. If there's interest in an SRU, I'd be happy to update the patch as needed.

[Sebastien Bacher (seb128)]

Thanks but the issue should be fixed in vivid before being SRUed, could you work on that as well?

review: Needs Information

[Michael Nelson (michael.nelson)]

Thanks Seb. There's nothing to fix in vivid is there? (I mean, assuming someone will sync squid3 in vivid from debian). Or is that what you mean? (Debian is already on 3.4.8 which is well beyond the fix landing upstream in 3.3.12).

[Oleg Strikov (strikov-deactivatedaccount)]

This issue has been fixed in vivid.

[Brian Murray (brian-murray)]

Oleg is correct this is neither fixed in Vivid nor Wily.

[Brian Murray (brian-murray)]

Oh, I misread it has been fixed in Vivid and Wily.

[Brian Murray (brian-murray)]

Given that bug 1336742 has a patch and that patch references the bug number, something that is necessary for an SRU, I'm going to go ahead and use that instead of this merge proposal.

Unmerged revisions

56. By Michael Nelson on 2014-07-03

Apply patch for squid bug #3806 which doesn't land upstream until 3.3.12 (LP: #1336742)

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-17 20:13:30 +0000
+++ debian/changelog	2014-07-03 14:28:09 +0000
@@ -1,3 +1,10 @@
+squid3 (3.3.8-1ubuntu7) UNRELEASED; urgency=medium
+
+  * debian/patches/91-caching-with-vary-3806.patch: Apply patch for upstream
+    bug 3806 which doesn't land upstream until 3.3.12 (LP: #1336742)
+
+ -- Michael Nelson <[e-mail]>  Thu, 03 Jul 2014 13:01:35 +0000
+
 squid3 (3.3.8-1ubuntu6) trusty; urgency=medium
 
   * debian/rules: Force -O2 to work around build failure with -O3.

=== added file 'debian/patches/91-caching-with-vary-3806.patch'
--- debian/patches/91-caching-with-vary-3806.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/91-caching-with-vary-3806.patch	2014-07-03 14:28:09 +0000
@@ -0,0 +1,60 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: 3806-caching-responses-with-vary/src/MemStore.cc
+===================================================================
+--- 3806-caching-responses-with-vary.orig/src/MemStore.cc	2014-07-03 12:35:37.000000000 +0000
++++ 3806-caching-responses-with-vary/src/MemStore.cc	2014-07-03 12:50:37.573140199 +0000
+@@ -310,6 +310,12 @@
+         return;
+     }
+ 
++    if (e.mem_obj->vary_headers) {
++        // XXX: We must store/load SerialisedMetaData to cache Vary in RAM
++        debugs(20, 5, "Vary not yet supported: " << e.mem_obj->vary_headers);
++        return;
++    }
++
+     keep(e); // may still fail
+ }
+ 
+Index: 3806-caching-responses-with-vary/src/client_side_reply.cc
+===================================================================
+--- 3806-caching-responses-with-vary.orig/src/client_side_reply.cc	2014-07-03 12:35:37.000000000 +0000
++++ 3806-caching-responses-with-vary/src/client_side_reply.cc	2014-07-03 12:57:08.817140199 +0000
+@@ -499,6 +499,7 @@
+ 
+     if (strcmp(e->mem_obj->url, urlCanonical(r)) != 0) {
+         debugs(33, DBG_IMPORTANT, "clientProcessHit: URL mismatch, '" << e->mem_obj->url << "' != '" << urlCanonical(r) << "'");
++        http->logType = LOG_TCP_MISS; // we lack a more precise LOG_*_MISS code
+         processMiss();
+         return;
+     }
+@@ -530,6 +531,7 @@
+     case VARY_CANCEL:
+         /* varyEvaluateMatch found a object loop. Process as miss */
+         debugs(88, DBG_IMPORTANT, "clientProcessHit: Vary object loop!");
++        http->logType = LOG_TCP_MISS; // we lack a more precise LOG_*_MISS code
+         processMiss();
+         return;
+     }
+Index: 3806-caching-responses-with-vary/src/store.cc
+===================================================================
+--- 3806-caching-responses-with-vary.orig/src/store.cc	2014-07-03 12:35:37.000000000 +0000
++++ 3806-caching-responses-with-vary/src/store.cc	2014-07-03 12:50:37.581140199 +0000
+@@ -780,12 +780,14 @@
+             }
+ 
+ #endif
+-            pe->replaceHttpReply(rep);
++            pe->replaceHttpReply(rep, false); // no write until key is public
+ 
+             pe->timestampsSet();
+ 
+             pe->makePublic();
+ 
++            pe->startWriting(); // after makePublic()
++
+             pe->complete();
+ 
+             pe->unlock();

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-11-09 00:30:15 +0000
+++ debian/patches/series	2014-07-03 14:28:09 +0000
@@ -6,3 +6,4 @@
 99-ubuntu-ssl-cert-snakeoil.patch
 fix-pod2man-config.test.patch
 fix-distribution.patch
+91-caching-with-vary-3806.patch