Merge from trunk

diff --cc configure.ac
Simple merge

diff --cc src/AccessLogEntry.h
Simple merge

diff --cc src/HttpMsg.cc
Simple merge

diff --cc src/HttpMsg.h
Simple merge

diff --cc src/HttpRequest.cc
Simple merge

diff --cc src/HttpRequest.h
index afe9243afac2d6ef4ce84947749a7bc01d483b58,0d8e3b057a35ef38919db99dc994cbfa4ed613c8..e0f1ed1b26a7b432069236db42b44e45081d18e7
--- 1/src/HttpRequest.h
--- 2/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 b87b3fca0fc1521a7996c10c13dc513471712216,5480bba3afc2ae240955a33e9b4b4c22f712c8da..62a6c8fcbf1850a830cf55bc874df3c933b93da3
--- 1/src/Makefile.am
--- 2/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/acl/MethodData.h
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/htcp.cc
Simple merge

diff --cc src/http/Makefile.am
Simple merge

diff --cc src/http/RequestMethod.cc
Simple merge

diff --cc src/http/RequestMethod.h
index 40bb82433cddce54b978be3231c17e31545c8957,dc1f88684d222db2615aaa389c9035b72c386e77..14c075daeb9d684e2f9581129c3ff3718363892b
--- 1/src/http/RequestMethod.h
--- 2/src/HttpRequestMethod.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>
  

diff --cc src/tests/testHttpRequestMethod.cc
Simple merge