Shuffle ChunkedCodingParser to libhttp1

diff --git a/src/Makefile.am b/src/Makefile.am
index b8d1ea2acb1c604a1a37523532e1aea13225c9eb..a209ed4fd6e340cac99dda26e92de8663ea92603 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -291,8 +291,6 @@ squid_SOURCES = \
        carp.cc \
        cbdata.cc \
        cbdata.h \
-       ChunkedCodingParser.cc \
-       ChunkedCodingParser.h \
        client_db.h \
        client_db.cc \
        client_side.h \

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index a8375a7ee68a8be8235eb0be743679254f97e247..c4af75942e02487cf570893e60bd5927273539e4 100644 (file)
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -22,10 +22,10 @@
 #include "auth/UserRequest.h"
 #include "base/TextException.h"
 #include "base64.h"
-#include "ChunkedCodingParser.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "err_detail_type.h"
+#include "http/one/ChunkedCodingParser.h"
 #include "HttpHeaderTools.h"
 #include "HttpMsg.h"
 #include "HttpReply.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 90f451b2933fd0dc00ec903256a71f5847a6929b..9c4b0d119b32f8ab55ffcb314b8984e1c4ad33ed 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -63,7 +63,6 @@
 #include "base/Subscription.h"
 #include "base/TextException.h"
 #include "CachePeer.h"
-#include "ChunkedCodingParser.h"
 #include "client_db.h"
 #include "client_side.h"
 #include "client_side_reply.h"
@@ -86,6 +85,7 @@
 #include "helper.h"
 #include "helper/Reply.h"
 #include "http.h"
+#include "http/one/ChunkedCodingParser.h"
 #include "http/one/RequestParser.h"
 #include "HttpHdrContRange.h"
 #include "HttpHeaderTools.h"

diff --git a/src/http.cc b/src/http.cc
index 5c3abc9a97ddf3ae2c6388280b0954ac080ba92a..7f7cde90b0d3d0b02e501f58f210bc38980e53fa 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -19,7 +19,6 @@
 #include "base/TextException.h"
 #include "base64.h"
 #include "CachePeer.h"
-#include "ChunkedCodingParser.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "comm/Read.h"
@@ -31,6 +30,7 @@
 #include "fde.h"
 #include "globals.h"
 #include "http.h"
+#include "http/one/ChunkedCodingParser.h"
 #include "http/one/ResponseParser.h"
 #include "HttpControlMsg.h"
 #include "HttpHdrCc.h"

diff --git a/src/ChunkedCodingParser.cc b/src/http/one/ChunkedCodingParser.cc
similarity index 99%
rename from src/ChunkedCodingParser.cc
rename to src/http/one/ChunkedCodingParser.cc
index ed38161083b019ed40ab7322bce97dee2d4449cb..c74ddae0894674f2f6613da45e98edfbf48e5ded 100644 (file)
--- a/src/ChunkedCodingParser.cc
+++ b/src/http/one/ChunkedCodingParser.cc
@@ -8,8 +8,8 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "ChunkedCodingParser.h"
 #include "Debug.h"
+#include "http/one/ChunkedCodingParser.h"
 #include "MemBuf.h"
 #include "Parsing.h"
 

diff --git a/src/ChunkedCodingParser.h b/src/http/one/ChunkedCodingParser.h
similarity index 100%
rename from src/ChunkedCodingParser.h
rename to src/http/one/ChunkedCodingParser.h

diff --git a/src/http/one/Makefile.am b/src/http/one/Makefile.am
index ce91c2d89b407d1a1810b623f3b37865998d2ff7..25dc303c5759011a6f705768d5acdaf6a649a910 100644 (file)
--- a/src/http/one/Makefile.am
+++ b/src/http/one/Makefile.am
@@ -11,6 +11,8 @@ include $(top_srcdir)/src/TestHeaders.am
 noinst_LTLIBRARIES = libhttp1.la
 
 libhttp1_la_SOURCES = \
+       ChunkedCodingParser.cc \
+       ChunkedCodingParser.h \
        forward.h \
        Parser.cc \
        Parser.h \