Merged from trunk rev.13627

diff --cc configure.ac
index 1f971fc8222aade2be85a6b7761d310dc88e9f52,e4e85c420a243eac531cf5541b73409f0ad75776..634ae8f15dbdb894ec001e70464935410d03ef72
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3766,8 -3781,8 +3781,9 @@@ AC_CONFIG_FILES(
        src/esi/Makefile
        src/eui/Makefile
        src/format/Makefile
+       src/helper/Makefile
        src/http/Makefile
 +      src/http/one/Makefile
        src/icmp/Makefile
        src/ident/Makefile
        src/ip/Makefile

diff --cc src/AccessLogEntry.h
Simple merge

diff --cc src/Makefile.am
index 44e193cdaf09b8ae14f1f6e0d3f3468bcc207622,91e05fc343c1b6dc7542b73711c2d85bc0f5a075..9102bf3a082db7c3b88dfa476de5eaa1c4aa44d4
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -618,11 -616,6 +612,12 @@@ squid_LDADD = 
        $(AUTH_LIBS) \
        $(DISK_LIBS) \
        acl/libapi.la \
 +      clients/libclients.la \
 +      servers/libservers.la \
 +      ftp/libftp.la \
++      helper/libhelper.la \
 +      http/libsquid-http.la \
 +      parser/libsquid-parser.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
@@@ -744,9 -743,9 +739,9 @@@ ufsdump_SOURCES = 
        ufsdump.cc \
        dlink.h \
        dlink.cc \
-       HelperChildConfig.h \
+       helper/ChildConfig.h \
        tests/stub_HelperChildConfig.cc \
 -      HttpRequestMethod.cc \
 +      http/RequestMethod.cc \
        RemovalPolicy.cc \
        $(WIN32_SOURCE) \
        fd.h \
@@@ -1347,8 -1344,9 +1340,10 @@@ tests_testACLMaxUserIP_SOURCES= 
  nodist_tests_testACLMaxUserIP_SOURCES= \
        $(TESTSOURCES)
  tests_testACLMaxUserIP_LDADD= \
+       libsquid.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
 +      parser/libsquid-parser.la \
        $(AUTH_ACL_LIBS) \
        ident/libident.la \
        acl/libacls.la \
@@@ -1602,17 -1597,18 +1591,18 @@@ nodist_tests_testCacheManager_SOURCES 
        $(DISKIO_GEN_SOURCE)
  # comm.cc only requires comm/libcomm.la until fdc_table is dead.
  tests_testCacheManager_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
 +      ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
 -      ftp/libftp.la \
 +      parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
 -      parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        comm/libcomm.la \
@@@ -1791,8 -1788,8 +1781,9 @@@ nodist_tests_testDiskIO_SOURCES= 
        SquidMath.h \
        swap_log_op.cc
  tests_testDiskIO_LDADD = \
+       libsquid.la \
        http/libsquid-http.la \
 +      parser/libsquid-parser.la \
        SquidConfig.o \
        CommCalls.o \
        DnsLookupDetails.o \
@@@ -2035,17 -2029,18 +2020,18 @@@ nodist_tests_testEvent_SOURCES = 
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
  tests_testEvent_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
 +      ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
 -      ftp/libftp.la \
 +      parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
 -      parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@@ -2284,17 -2277,18 +2265,18 @@@ nodist_tests_testEventLoop_SOURCES = 
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
  tests_testEventLoop_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
 +      ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
 -      ftp/libftp.la \
 +      parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
 -      parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        anyp/libanyp.la \
@@@ -2526,11 -2518,12 +2503,13 @@@ nodist_tests_test_http_range_SOURCES = 
        $(BUILT_SOURCES) \
        $(DISKIO_GEN_SOURCE)
  tests_test_http_range_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
 +      ftp/libftp.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
 -      ftp/libftp.la \
 +      parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@@ -2819,10 -2808,11 +2793,12 @@@ tests_testHttpRequest_SOURCES = 
  nodist_tests_testHttpRequest_SOURCES = \
        $(BUILT_SOURCES)
  tests_testHttpRequest_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
+       helper/libhelper.la \
        ftp/libftp.la \
 +      http/libsquid-http.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@@ -3007,8 -2998,8 +2983,9 @@@ nodist_tests_testStore_SOURCES= 
        swap_log_op.cc
  
  tests_testStore_LDADD= \
+       libsquid.la \
        http/libsquid-http.la \
 +      parser/libsquid-parser.la \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@@ -3659,19 -3647,20 +3630,20 @@@ tests_testURL_SOURCES = 
  nodist_tests_testURL_SOURCES = \
        $(BUILT_SOURCES)
  tests_testURL_LDADD = \
+       libsquid.la \
        clients/libclients.la \
        servers/libservers.la \
+       helper/libhelper.la \
        http/libsquid-http.la \
        ftp/libftp.la \
 +      parser/libsquid-parser.la \
        anyp/libanyp.la \
        ident/libident.la \
        acl/libacls.la \
        eui/libeui.la \
        acl/libstate.la \
        acl/libapi.la \
 -      parser/libsquid-parser.la \
        base/libbase.la \
-       libsquid.la \
        ip/libip.la \
        fs/libfs.la \
        $(SSL_LIBS) \

diff --cc src/client_side.cc
index 6d6a787f38274bf464df1189ba521672f208042f,4af2cc9baca2a404012383f821a398fef933e4b3..167955355903476be71066d346983cdfc6b53c25
--- 1/src/client_side.cc
--- 2/src/client_side.cc
+++ b/src/client_side.cc
@@@ -83,8 -83,9 +83,10 @@@
  #include "fqdncache.h"
  #include "FwdState.h"
  #include "globals.h"
+ #include "helper.h"
+ #include "helper/Reply.h"
  #include "http.h"
 +#include "http/one/RequestParser.h"
  #include "HttpHdrContRange.h"
  #include "HttpHeaderTools.h"
  #include "HttpReply.h"

diff --cc src/client_side.h
index f5c4038a2bb33fe155ecf9219112dc847f7d11f3,b9c044b96f6d5b27217a930351c94650b556e400..bced5462b26097040f80ae7998d7e20663543b11
--- 1/src/client_side.h
--- 2/src/client_side.h
+++ b/src/client_side.h
@@@ -13,8 -13,9 +13,9 @@@
  
  #include "clientStreamForward.h"
  #include "comm.h"
+ #include "helper/forward.h"
  #include "HttpControlMsg.h"
 -#include "HttpParser.h"
 +#include "http/forward.h"
  #include "ipc/FdNotes.h"
  #include "SBuf.h"
  #if USE_AUTH

diff --cc src/htcp.cc
Simple merge

diff --cc src/servers/FtpServer.cc
Simple merge