From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 22 Dec 2013 22:40:03 +0000 (-0800)
Subject: Shuffle HttpParser to libsquid-http as Http1Parser
X-Git-Tag: merge-candidate-3-v1~506^2~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5bc8fb2cda7d38c1ee80ed6d8edb021791484faa;p=thirdparty%2Fsquid.git

Shuffle HttpParser to libsquid-http as Http1Parser
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 1385879c7d..fb43057e26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -406,8 +406,6 @@ squid_SOURCES = \
 	HttpControlMsg.h \
 	HttpMsg.cc \
 	HttpMsg.h \
-	HttpParser.cc \
-	HttpParser.h \
 	HttpReply.cc \
 	HttpReply.h \
 	RequestFlags.h \
@@ -1380,8 +1378,6 @@ tests_testBoilerplate_DEPENDENCIES = \
 tests_testCacheManager_SOURCES = \
 	AccessLogEntry.cc \
 	debug.cc \
-	HttpParser.cc \
-	HttpParser.h \
 	RequestFlags.h \
 	RequestFlags.cc \
 	HttpRequest.cc \
@@ -1887,8 +1883,6 @@ tests_testEvent_SOURCES = \
 	HttpHdrSc.cc \
 	HttpHdrScTarget.cc \
 	HttpMsg.cc \
-	HttpParser.cc \
-	HttpParser.h \
 	HttpReply.cc \
 	RequestFlags.h \
 	RequestFlags.cc \
@@ -2133,8 +2127,6 @@ tests_testEventLoop_SOURCES = \
 	HttpHdrSc.cc \
 	HttpHdrScTarget.cc \
 	HttpMsg.cc \
-	HttpParser.cc \
-	HttpParser.h \
 	HttpReply.cc \
 	RequestFlags.h \
 	RequestFlags.cc \
@@ -2375,8 +2367,6 @@ tests_test_http_range_SOURCES = \
 	HttpHeaderTools.h \
 	HttpHeaderTools.cc \
 	HttpMsg.cc \
-	HttpParser.cc \
-	HttpParser.h \
 	HttpReply.cc \
 	RequestFlags.h \
 	RequestFlags.cc \
@@ -2533,8 +2523,6 @@ tests_test_http_range_DEPENDENCIES = \
 
 tests_testHttpParser_SOURCES = \
 	Debug.h \
-	HttpParser.cc \
-	HttpParser.h \
 	MemBuf.cc \
 	MemBuf.h \
 	Mem.h \
@@ -2575,8 +2563,6 @@ tests_testHttpParser_DEPENDENCIES = \
 ## Tests of the HttpRequest module.
 tests_testHttpRequest_SOURCES = \
 	AccessLogEntry.cc \
-	HttpParser.cc \
-	HttpParser.h \
 	RequestFlags.h \
 	RequestFlags.cc \
 	HttpRequest.cc \
@@ -3475,8 +3461,6 @@ tests_testURL_SOURCES = \
 	HttpHeaderTools.h \
 	HttpHeaderTools.cc \
 	HttpMsg.cc \
-	HttpParser.cc \
-	HttpParser.h \
 	HttpReply.cc \
 	RequestFlags.h \
 	RequestFlags.cc \
diff --git a/src/client_side.cc b/src/client_side.cc
index 9a0f45b938..4b8851d85f 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -104,9 +104,9 @@
 #include "FwdState.h"
 #include "globals.h"
 #include "http.h"
+#include "http/Http1Parser.h"
 #include "HttpHdrContRange.h"
 #include "HttpHeaderTools.h"
-#include "HttpParser.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ident/Config.h"
diff --git a/src/HttpParser.cc b/src/http/Http1Parser.cc
similarity index 99%
rename from src/HttpParser.cc
rename to src/http/Http1Parser.cc
index 9eb8bb2589..eda9366798 100644
--- a/src/HttpParser.cc
+++ b/src/http/Http1Parser.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
 #include "Debug.h"
-#include "HttpParser.h"
+#include "http/Http1Parser.h"
 #include "profiler/Profiler.h"
 #include "SquidConfig.h"
 
diff --git a/src/HttpParser.h b/src/http/Http1Parser.h
similarity index 100%
rename from src/HttpParser.h
rename to src/http/Http1Parser.h
diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index 7c7530bd1a..f195684952 100644
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -4,6 +4,8 @@ include $(top_srcdir)/src/TestHeaders.am
 noinst_LTLIBRARIES = libsquid-http.la
 
 libsquid_http_la_SOURCES = \
+	Http1Parser.cc \
+	Http1Parser.h \
 	MethodType.cc \
 	MethodType.h \
 	ProtocolVersion.h \
diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc
index 9a1e2f6f9a..490572a2cf 100644
--- a/src/tests/testHttpParser.cc
+++ b/src/tests/testHttpParser.cc
@@ -7,7 +7,7 @@
 #define protected public
 
 #include "testHttpParser.h"
-#include "HttpParser.h"
+#include "http/Http1Parser.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "SquidConfig.h"