From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Jan 2014 01:44:45 +0000 (-0800)
Subject: Merge from trunk
X-Git-Tag: merge-candidate-3-v1~506^2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c24f7fb6c27201f9d5cbc5c6f19b5b061ac36b2b;p=thirdparty%2Fsquid.git

Merge from trunk
---

c24f7fb6c27201f9d5cbc5c6f19b5b061ac36b2b
diff --cc src/Makefile.am
index f0544bb742,bb6b1aa030..9b8b1ee4c9
--- a/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/Store.h
index 2b5ff0c346,c1fad115e9..ee448fe4f2
--- a/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"