Shuffle HttpParser to libsquid-http as Http1Parser

diff --git a/src/Makefile.am b/src/Makefile.am
index 1385879c7d9303a3745cd7ebff2472ee5b59a697..fb43057e2658ee2f5dd6416ca2fe32424fd5084d 100644 (file)
--- 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 9a0f45b9381ac03fd3d8badec240601fc3deafba..4b8851d85fb696ff08e40ce5962abec3b0b6c14c 100644 (file)
--- 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 9eb8bb25892f695dfd361ee106169e1712fa2eb2..eda9366798b34e3f0293ce744ad3c12baa2608c7 100644 (file)
--- 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 7c7530bd1a55d000c06162d2ccf40da13e3242be..f195684952702605f32a05bbb46cf3ff16dd10d7 100644 (file)
--- 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 9a1e2f6f9a4c04d287d507eb950f56cf3db5172a..490572a2cfc9da5cf956ab562428a530916da661 100644 (file)
--- 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"