From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 28 Mar 2015 17:29:35 +0000 (-0700)
Subject: Shuffle ChunkedCodingParser to libhttp1
X-Git-Tag: merge-candidate-3-v1~86^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d6a804261f1b172627fbe89c7d85a2b1e144033;p=thirdparty%2Fsquid.git

Shuffle ChunkedCodingParser to libhttp1
---

diff --git a/src/Makefile.am b/src/Makefile.am
index b8d1ea2acb..a209ed4fd6 100644
--- 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 a8375a7ee6..c4af75942e 100644
--- 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 90f451b293..9c4b0d119b 100644
--- 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 5c3abc9a97..7f7cde90b0 100644
--- 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 ed38161083..c74ddae089 100644
--- 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 ce91c2d89b..25dc303c57 100644
--- 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 \