Merged from parent (large-rock r12530 including trunk r12732; v3.3.3+).

diff --cc src/Makefile.am
Simple merge

diff --cc src/SquidConfig.h
Simple merge

diff --cc src/SwapDir.h
Simple merge

diff --cc src/cf.data.pre
index 9f4f2cb20997d36d200bb84feb18fc5508b2179a,a4c91786f1a3b52f6b95396f865a9d10b79bc310..14b60aa74036504c94d6fe3e2f61a2249f70d5dd
--- 1/src/cf.data.pre
--- 2/src/cf.data.pre
+++ b/src/cf.data.pre
@@@ -104,6 -104,57 +104,51 @@@ COMMENT_STAR
        across all Squid processes.
  COMMENT_END
  
 -NAME: collapsed_forwarding
 -TYPE: obsolete
 -DOC_START
 -      This option is not yet supported by Squid-3. see http://bugs.squid-cache.org/show_bug.cgi?id=3495
 -DOC_END
 -
+ # options still not yet ported from 2.7 to 3.x
+ NAME: broken_vary_encoding
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ NAME: cache_vary
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ NAME: error_map
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ NAME: external_refresh_check
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ NAME: ignore_ims_on_miss
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ NAME: location_rewrite_program location_rewrite_access location_rewrite_children location_rewrite_concurrency
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ NAME: refresh_stale_hit
+ TYPE: obsolete
+ DOC_START
+       This option is not yet supported by Squid-3.
+ DOC_END
+ 
+ # no Options Removed in 3.3
+ 
  # Options Removed in 3.2
  NAME: ignore_expect_100
  TYPE: obsolete

diff --cc src/client_side_reply.cc
index de278d7da97e1dcffabf73c277e920967a5fd41c,cf41725c88d4670b73928deae88de9b7724e841d..2bf9a174375dd966c76b90c97d4fa52b2b7e7793
--- 1/src/client_side_reply.cc
--- 2/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@@ -2174,20 -2186,13 +2186,22 @@@ clientReplyContext::createStoreEntry(co
       * so make a fake one.
       */
  
-     if (http->request == NULL)
-         http->request = HTTPMSGLOCK(new HttpRequest(m, AnyP::PROTO_NONE, null_string));
+     if (http->request == NULL) {
+         http->request = new HttpRequest(m, AnyP::PROTO_NONE, null_string);
+         HTTPMSGLOCK(http->request);
+     }
  
-     StoreEntry *e = storeCreateEntry(http->uri, http->log_uri, reqFlags, m);
+     StoreEntry *e = storeCreateEntry(storeId(), http->log_uri, reqFlags, m);
  
 +    // Make entry collapsable ASAP, to increase collapsing chances for others.
 +    // TODO: why is !.needValidation required here?
 +    if (Config.onoff.collapsed_forwarding && reqFlags.cachable &&
 +        !reqFlags.needValidation &&
 +        (m == Http::METHOD_GET || m == Http::METHOD_HEAD)) {
 +        // make the entry available for future requests now
 +        Store::Root().allowCollapsing(e, reqFlags, m);
 +    }
 +
      sc = storeClientListAdd(e, this);
  
  #if USE_DELAY_POOLS

diff --cc src/http.cc
index 0c03e62bc2618c29cd3c9f1d8c3edac14216acaa,685204132fc7b76aa4fc2ef5b3382ce5177edeff..978f7e907d3abc0a22bba681ec63939ac333957b
--- 1/src/http.cc
--- 2/src/http.cc
+++ b/src/http.cc
@@@ -188,10 -188,8 +188,10 @@@ HttpStateData::httpTimeout(const CommTi
      serverConnection->close();
  }
  
 +/// Remove an existing public store entry if the incoming response (to be
 +/// stored in a currently private entry) is going to invalidate it.
  static void
- httpMaybeRemovePublic(StoreEntry * e, http_status status)
+ httpMaybeRemovePublic(StoreEntry * e, Http::StatusCode status)
  {
      int remove = 0;
      int forbidden = 0;

diff --cc src/stmem.cc
Simple merge

diff --cc src/store.cc
Simple merge

diff --cc src/store_dir.cc
Simple merge