Merge from trunk

diff --cc src/Makefile.am
index f0544bb742f72ac04e3e7e6b566b9c1eb022fcc3,bb6b1aa030a59f4d0c8118e60e2bb5826bcc55a0..9b8b1ee4c9658ab53e2dcf29139cf499f39cfee1
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -2513,14 -2547,15 +2530,15 @@@ tests_test_http_range_LDFLAGS = $(LIBAD
  tests_test_http_range_DEPENDENCIES = \
        $(SQUID_CPPUNIT_LA)
  
 -tests_testHttpParser_SOURCES = \
 +tests_testHttp1Parser_SOURCES = \
        Debug.h \
 -      HttpParser.cc \
 -      HttpParser.h \
        MemBuf.cc \
        MemBuf.h \
+       tests/stub_MemObject.cc \
        Mem.h \
        tests/stub_mem.cc \
 +      mime_header.cc \
 +      mime_header.h \
        String.cc \
        cache_cf.h \
        YesNoNone.h \
@@@ -2531,10 -2568,13 +2551,13 @@@
        tests/stub_debug.cc \
        tests/stub_event.cc \
        tests/stub_HelperChildConfig.cc \
+       tests/stub_stmem.cc \
+       tests/stub_store.cc \
+       tests/stub_store_stats.cc \
        tools.h \
        tests/stub_tools.cc \
 -      tests/testHttpParser.cc \
 -      tests/testHttpParser.h \
 +      tests/testHttp1Parser.cc \
 +      tests/testHttp1Parser.h \
        tests/testMain.cc \
        tests/stub_time.cc \
        wordlist.h \

diff --cc src/MemObject.h
Simple merge

diff --cc src/Store.h
index 2b5ff0c346691289a3faf75fd922b23f6da95c54,c1fad115e9718240168d86ae32297567ccfb2636..ee448fe4f2931a9b4ab3ffe3edeab6d769f9aa7a
--- 1/src/Store.h
--- 2/src/Store.h
+++ b/src/Store.h
@@@ -39,8 -39,9 +39,10 @@@
  #include "comm/forward.h"
  #include "CommRead.h"
  #include "hash.h"
 +#include "http/forward.h"
++#include "http/RequestMethod.h"
  #include "HttpReply.h"
 -#include "HttpRequestMethod.h"
+ #include "MemObject.h"
  #include "Range.h"
  #include "RemovalPolicy.h"
  #include "StoreIOBuffer.h"

diff --cc src/client_side.cc
Simple merge

diff --cc src/mime.cc
Simple merge