From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 30 Apr 2014 11:09:38 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: merge-candidate-3-v1~506^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0124266e7e0fdffe16bfcb54ea12023a5069aea;p=thirdparty%2Fsquid.git

Merge from trunk
---

f0124266e7e0fdffe16bfcb54ea12023a5069aea
diff --cc src/HttpRequest.h
index afe9243afa,0d8e3b057a..e0f1ed1b26
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@@ -36,9 -36,10 +36,10 @@@
  #include "err_type.h"
  #include "HierarchyLogEntry.h"
  #include "HttpMsg.h"
 -#include "HttpRequestMethod.h"
 +#include "http/RequestMethod.h"
  #include "Notes.h"
  #include "RequestFlags.h"
+ #include "URL.h"
  
  #if USE_AUTH
  #include "auth/UserRequest.h"
diff --cc src/Makefile.am
index b87b3fca0f,5480bba3af..62a6c8fcbf
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1888,7 -1901,11 +1893,9 @@@ tests_testEvent_SOURCES = 
  	HttpHdrSc.cc \
  	HttpHdrScTarget.cc \
  	HttpMsg.cc \
 -	HttpParser.cc \
 -	HttpParser.h \
  	HttpReply.cc \
+ 	PeerPoolMgr.h \
+ 	PeerPoolMgr.cc \
  	RequestFlags.h \
  	RequestFlags.cc \
  	HttpRequest.cc \
@@@ -2133,7 -2151,11 +2140,9 @@@ tests_testEventLoop_SOURCES = 
  	HttpHdrSc.cc \
  	HttpHdrScTarget.cc \
  	HttpMsg.cc \
 -	HttpParser.cc \
 -	HttpParser.h \
  	HttpReply.cc \
+ 	PeerPoolMgr.h \
+ 	PeerPoolMgr.cc \
  	RequestFlags.h \
  	RequestFlags.cc \
  	HttpRequest.cc \
@@@ -2374,7 -2397,11 +2383,9 @@@ tests_test_http_range_SOURCES = 
  	HttpHeaderTools.h \
  	HttpHeaderTools.cc \
  	HttpMsg.cc \
 -	HttpParser.cc \
 -	HttpParser.h \
  	HttpReply.cc \
+ 	PeerPoolMgr.h \
+ 	PeerPoolMgr.cc \
  	RequestFlags.h \
  	RequestFlags.cc \
  	HttpRequest.cc \
@@@ -3488,7 -3525,11 +3503,9 @@@ tests_testURL_SOURCES = 
  	HttpHeaderTools.h \
  	HttpHeaderTools.cc \
  	HttpMsg.cc \
 -	HttpParser.cc \
 -	HttpParser.h \
  	HttpReply.cc \
+ 	PeerPoolMgr.h \
+ 	PeerPoolMgr.cc \
  	RequestFlags.h \
  	RequestFlags.cc \
  	HttpRequest.cc \
diff --cc src/http/RequestMethod.h
index 40bb82433c,dc1f88684d..14c075daeb
--- a/src/http/RequestMethod.h
+++ b/src/http/RequestMethod.h
@@@ -1,9 -1,10 +1,11 @@@
  #ifndef SQUID_HTTPREQUESTMETHOD_H
  #define SQUID_HTTPREQUESTMETHOD_H
  
 +#include "http/forward.h"
  #include "http/MethodType.h"
- #include "SquidString.h"
+ #include "SBuf.h"
+ 
+ class SquidConfig;
  
  #include <iosfwd>