Merged from trunk 13199.

diff --cc src/Makefile.am
index 25b1358de25ccccecffea5120a1e764847688611,f39833ce9115a505cc091c0bf511d13b10baf8b2..fa354c6c7375c6f184e6ace6b55a55562b15d69d
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -3709,6 -3675,45 +3714,46 @@@ tests_testSBuf_LDADD=
        $(COMMON_LIBS)
  tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
  
+ tests_testSBufList_SOURCES= \
+       tests/testSBufList.h \
+       tests/testSBufList.cc \
+       tests/testMain.cc \
+       $(SBUF_SOURCE) \
+   SBufList.h \
+   SBufList.cc \
+   SBufAlgos.h \
+       SBufDetailedStats.h \
+       tests/stub_SBufDetailedStats.cc \
+       SBufStream.h \
+       tests/stub_time.cc \
+       mem.cc \
+       tests/stub_debug.cc \
+       tests/stub_event.cc \
+       tests/stub_fatal.cc \
+       tests/stub_HelperChildConfig.cc \
+       tests/stub_cache_cf.cc \
+       tests/stub_cache_manager.cc \
++      tests/stub_store.cc \
+       tests/stub_store_stats.cc \
+       tests/stub_tools.cc \
+       SquidString.h \
+       String.cc \
+       tests/stub_wordlist.cc \
+       tests/stub_MemBuf.cc
+ nodist_tests_testSBufList_SOURCES=$(TESTSOURCES)
+ tests_testSBufList_LDFLAGS = $(LIBADD_DL)
+ tests_testSBufList_LDADD=\
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(COMPAT_LIB) \
+       libsquid.la \
+       ip/libip.la \
+       mgr/libmgr.la \
+       base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMMON_LIBS)
+ tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
+ 
  tests_testConfigParser_SOURCES = \
        ClientInfo.h \
        Mem.h \

diff --cc src/Server.cc
index 295bb5509c8f879dc2dbbf1396b6028ca9f31639,5cbb391c02e6c50df2c5ae3528c23419e669dfbc..8438cd29786ef00615c34d8e3af06c4fe251e33f
--- 1/src/Server.cc
--- 2/src/Server.cc
+++ b/src/Server.cc
@@@ -174,6 -175,8 +175,8 @@@ ServerStateData::setFinalReply(HttpRepl
      // give entry the reply because haveParsedReplyHeaders() expects it there
      entry->replaceHttpReply(theFinalReply, false); // but do not write yet
      haveParsedReplyHeaders(); // update the entry/reply (e.g., set timestamps)
 -    if (EBIT_TEST(entry->flags, ENTRY_CACHABLE) && blockCaching())
++    if (!EBIT_TEST(entry->flags, RELEASE_REQUEST) && blockCaching())
+         entry->release();
      entry->startWriting(); // write the updated entry to store
  
      return theFinalReply;

diff --cc src/SquidConfig.h
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/client_side_reply.h
index ac1e369ceaf0a6b44f36bf70d0d18c0515a2746b,7cebe1cc7bcbc5895cc902e479f9fd72a427a337..29f72ac71a500c22cc1876ad6b992d36c4ade723
--- 1/src/client_side_reply.h
--- 2/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@@ -140,7 -140,7 +140,8 @@@ private
      void triggerInitialStoreRead();
      void sendClientOldEntry();
      void purgeAllCached();
 +    void forgetHit();
+     bool blockedHit() const;
  
      void sendBodyTooLargeError();
      void sendPreconditionFailedError();

diff --cc src/format/Format.cc
index 366a8b116308930682456517be2d3bddfb8aec9b,f6d903c6f27bd1b86a610e5ec8cb86f5f127027f..f15ff7596c85e73052c27fc9b8fcafd3cdc61e29
--- 1/src/format/Format.cc
--- 2/src/format/Format.cc
+++ b/src/format/Format.cc
@@@ -496,11 -496,11 +496,11 @@@ Format::Format::assemble(MemBuf &mb, co
          break;
  
          case LFT_TIME_START: {
-             int precision = fmt->widthMax >=0 ? fmt->widthMax :3;
-             snprintf(tmp, sizeof(tmp), "%0*" PRId64 ".%0*d", fmt->zero && (fmt->widthMin - precision - 1 >= 0) ? fmt->widthMin - precision - 1 : 0, (int64_t)al->cache.start_time.tv_sec, precision, (int)(al->cache.start_time.tv_usec / fmt->divisor));
+             int precision = fmt->widthMax >=0 ? fmt->widthMax : 3;
+             snprintf(tmp, sizeof(tmp), "%0*" PRId64 ".%0*d", fmt->zero && (fmt->widthMin - precision - 1 >= 0) ? fmt->widthMin - precision - 1 : 0, static_cast<int64_t>(al->cache.start_time.tv_sec), precision, (int)(al->cache.start_time.tv_usec / fmt->divisor));
              out = tmp;
          }
 -            break;
 +        break;
  
          case LFT_TIME_TO_HANDLE_REQUEST:
              outint = al->cache.msec;

diff --cc src/ftp.cc
Simple merge