From f35c0145fabb1ccbd6bc9859eb870d8d817f1a4d Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 23 Dec 2013 09:26:50 -0800 Subject: [PATCH] Shuffle HttpRequestMethod.h to libsquid-http.la --- src/AccessLogEntry.h | 2 +- src/HttpMsg.h | 2 +- src/HttpRequest.h | 2 +- src/Makefile.am | 15 +-------------- src/MemObject.h | 2 +- src/Store.h | 2 +- src/acl/Method.h | 2 +- src/acl/MethodData.cc | 1 - src/acl/MethodData.h | 2 +- src/cache_cf.cc | 1 - src/htcp.h | 4 +--- src/http/Makefile.am | 3 +++ .../RequestMethod.cc} | 2 +- src/{HttpRequestMethod.h => http/RequestMethod.h} | 0 src/mgr/ActionParams.h | 2 +- src/mgr/ActionWriter.h | 1 - src/mgr/Filler.h | 1 - src/tests/testHttpRequestMethod.cc | 2 +- 18 files changed, 15 insertions(+), 31 deletions(-) rename src/{HttpRequestMethod.cc => http/RequestMethod.cc} (99%) rename src/{HttpRequestMethod.h => http/RequestMethod.h} (100%) diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h index 73da24e3ea..31767a6842 100644 --- a/src/AccessLogEntry.h +++ b/src/AccessLogEntry.h @@ -36,7 +36,7 @@ #include "HierarchyLogEntry.h" #include "http/ProtocolVersion.h" #include "HttpHeader.h" -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" #include "icp_opcode.h" #include "ip/Address.h" #include "LogTags.h" diff --git a/src/HttpMsg.h b/src/HttpMsg.h index 726f446e26..6f30581921 100644 --- a/src/HttpMsg.h +++ b/src/HttpMsg.h @@ -33,10 +33,10 @@ #include "base/Lock.h" #include "BodyPipe.h" +#include "http/forward.h" #include "http/ProtocolVersion.h" #include "http/StatusCode.h" #include "HttpHeader.h" -#include "HttpRequestMethod.h" /// common parts of HttpRequest and HttpReply class HttpMsg : public RefCountable diff --git a/src/HttpRequest.h b/src/HttpRequest.h index b1301fa706..42885c2a9d 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -36,7 +36,7 @@ #include "err_type.h" #include "HierarchyLogEntry.h" #include "HttpMsg.h" -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" #include "Notes.h" #include "RequestFlags.h" diff --git a/src/Makefile.am b/src/Makefile.am index 5c7f248eff..dca9bd5a1b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -412,8 +412,6 @@ squid_SOURCES = \ RequestFlags.cc \ HttpRequest.cc \ HttpRequest.h \ - HttpRequestMethod.cc \ - HttpRequestMethod.h \ ICP.h \ icp_opcode.h \ icp_v2.cc \ @@ -739,7 +737,7 @@ ufsdump_SOURCES = \ dlink.cc \ HelperChildConfig.h \ tests/stub_HelperChildConfig.cc \ - HttpRequestMethod.cc \ + http/RequestMethod.cc \ RemovalPolicy.cc \ $(WIN32_SOURCE) \ fd.h \ @@ -1244,7 +1242,6 @@ tests_testACLMaxUserIP_SOURCES= \ HttpHdrSc.cc \ HttpHdrScTarget.cc \ HttpMsg.cc \ - HttpRequestMethod.cc \ int.h \ int.cc \ MasterXaction.cc \ @@ -1381,7 +1378,6 @@ tests_testCacheManager_SOURCES = \ RequestFlags.h \ RequestFlags.cc \ HttpRequest.cc \ - HttpRequestMethod.cc \ Mem.h \ tests/stub_mem.cc \ String.cc \ @@ -1658,7 +1654,6 @@ tests_testDiskIO_SOURCES = \ HttpHeader.cc \ HttpMsg.cc \ HttpReply.cc \ - HttpRequestMethod.cc \ int.h \ int.cc \ SquidList.h \ @@ -1887,7 +1882,6 @@ tests_testEvent_SOURCES = \ RequestFlags.h \ RequestFlags.cc \ HttpRequest.cc \ - HttpRequestMethod.cc \ icp_v2.cc \ icp_v3.cc \ $(IPC_SOURCE) \ @@ -2131,7 +2125,6 @@ tests_testEventLoop_SOURCES = \ RequestFlags.h \ RequestFlags.cc \ HttpRequest.cc \ - HttpRequestMethod.cc \ icp_v2.cc \ icp_v3.cc \ $(IPC_SOURCE) \ @@ -2371,7 +2364,6 @@ tests_test_http_range_SOURCES = \ RequestFlags.h \ RequestFlags.cc \ HttpRequest.cc \ - HttpRequestMethod.cc \ icp_v2.cc \ icp_v3.cc \ int.h \ @@ -2567,7 +2559,6 @@ tests_testHttpRequest_SOURCES = \ RequestFlags.h \ RequestFlags.cc \ HttpRequest.cc \ - HttpRequestMethod.cc \ Mem.h \ tests/stub_mem.cc \ String.cc \ @@ -2835,7 +2826,6 @@ tests_testStore_SOURCES= \ HttpHeader.h \ HttpHeader.cc \ HttpMsg.cc \ - HttpRequestMethod.cc \ RequestFlags.cc \ RequestFlags.h \ int.h \ @@ -3097,7 +3087,6 @@ tests_testUfs_SOURCES = \ store_dir.cc \ repl_modules.h \ store.cc \ - HttpRequestMethod.cc \ store_key_md5.h \ store_key_md5.cc \ Parsing.cc \ @@ -3253,7 +3242,6 @@ tests_testRock_SOURCES = \ HttpHeaderTools.cc \ HttpMsg.cc \ HttpReply.cc \ - HttpRequestMethod.cc \ int.h \ int.cc \ SquidList.h \ @@ -3466,7 +3454,6 @@ tests_testURL_SOURCES = \ RequestFlags.h \ RequestFlags.cc \ HttpRequest.cc \ - HttpRequestMethod.cc \ icp_v2.cc \ icp_v3.cc \ $(IPC_SOURCE) \ diff --git a/src/MemObject.h b/src/MemObject.h index a4548b0fb4..e07acd9a20 100644 --- a/src/MemObject.h +++ b/src/MemObject.h @@ -33,7 +33,7 @@ #include "CommRead.h" #include "dlink.h" -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" #include "RemovalPolicy.h" #include "stmem.h" #include "StoreIOBuffer.h" diff --git a/src/Store.h b/src/Store.h index 5576388302..2b5ff0c346 100644 --- a/src/Store.h +++ b/src/Store.h @@ -39,8 +39,8 @@ #include "comm/forward.h" #include "CommRead.h" #include "hash.h" +#include "http/forward.h" #include "HttpReply.h" -#include "HttpRequestMethod.h" #include "Range.h" #include "RemovalPolicy.h" #include "StoreIOBuffer.h" diff --git a/src/acl/Method.h b/src/acl/Method.h index 636793d4ad..1589087dff 100644 --- a/src/acl/Method.h +++ b/src/acl/Method.h @@ -35,7 +35,7 @@ #include "acl/Strategised.h" #include "acl/Strategy.h" -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" /// \ingroup ACLAPI class ACLMethodStrategy : public ACLStrategy diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc index b9a8fefd8a..9e371a8342 100644 --- a/src/acl/MethodData.cc +++ b/src/acl/MethodData.cc @@ -36,7 +36,6 @@ #include "acl/Checklist.h" #include "acl/MethodData.h" #include "cache_cf.h" -#include "HttpRequestMethod.h" #include "wordlist.h" int ACLMethodData::ThePurgeCount = 0; diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h index 2b4a4083f3..a533ab0e5c 100644 --- a/src/acl/MethodData.h +++ b/src/acl/MethodData.h @@ -36,7 +36,7 @@ #include "acl/Acl.h" #include "acl/Data.h" #include "CbDataList.h" -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" /// \ingroup ACLAPI class ACLMethodData : public ACLData diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 667b7b3b82..0b47524699 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -53,7 +53,6 @@ #include "format/Format.h" #include "globals.h" #include "HttpHeaderTools.h" -#include "HttpRequestMethod.h" #include "ident/Config.h" #include "ip/Intercept.h" #include "ip/QosConfig.h" diff --git a/src/htcp.h b/src/htcp.h index cb33473362..77e0bbbb5b 100644 --- a/src/htcp.h +++ b/src/htcp.h @@ -33,11 +33,9 @@ #if USE_HTCP #include "HttpHeader.h" -#include "HttpRequestMethod.h" +#include "http/forward.h" #include "ip/forward.h" -class HttpRequest; - /// \ingroup ServerProtocolHTCP class HtcpReplyData { diff --git a/src/http/Makefile.am b/src/http/Makefile.am index f195684952..1d26bd0ae4 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -4,11 +4,14 @@ include $(top_srcdir)/src/TestHeaders.am noinst_LTLIBRARIES = libsquid-http.la libsquid_http_la_SOURCES = \ + forward.h \ Http1Parser.cc \ Http1Parser.h \ MethodType.cc \ MethodType.h \ ProtocolVersion.h \ + RequestMethod.cc \ + RequestMethod.h \ StatusCode.cc \ StatusCode.h \ StatusLine.cc \ diff --git a/src/HttpRequestMethod.cc b/src/http/RequestMethod.cc similarity index 99% rename from src/HttpRequestMethod.cc rename to src/http/RequestMethod.cc index 3c4aa54a2c..0b805ddffd 100644 --- a/src/HttpRequestMethod.cc +++ b/src/http/RequestMethod.cc @@ -3,7 +3,7 @@ */ #include "squid.h" -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" #include "SquidConfig.h" #include "wordlist.h" diff --git a/src/HttpRequestMethod.h b/src/http/RequestMethod.h similarity index 100% rename from src/HttpRequestMethod.h rename to src/http/RequestMethod.h diff --git a/src/mgr/ActionParams.h b/src/mgr/ActionParams.h index d3fd4a1c6b..898353c9d8 100644 --- a/src/mgr/ActionParams.h +++ b/src/mgr/ActionParams.h @@ -6,7 +6,7 @@ #ifndef SQUID_MGR_ACTION_PARAMS_H #define SQUID_MGR_ACTION_PARAMS_H -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" #include "ipc/forward.h" #include "mgr/QueryParams.h" #include "RequestFlags.h" diff --git a/src/mgr/ActionWriter.h b/src/mgr/ActionWriter.h index 1cad07bec1..3b4a2d1398 100644 --- a/src/mgr/ActionWriter.h +++ b/src/mgr/ActionWriter.h @@ -7,7 +7,6 @@ #define SQUID_MGR_ACTION_WRITER_H #include "comm/forward.h" -#include "HttpRequestMethod.h" #include "mgr/StoreToCommWriter.h" namespace Mgr diff --git a/src/mgr/Filler.h b/src/mgr/Filler.h index 1134df740b..723ff75b4e 100644 --- a/src/mgr/Filler.h +++ b/src/mgr/Filler.h @@ -7,7 +7,6 @@ #define SQUID_MGR_FILLER_H #include "comm/forward.h" -#include "HttpRequestMethod.h" #include "mgr/Action.h" #include "mgr/StoreToCommWriter.h" diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc index b90099422d..8211aa1468 100644 --- a/src/tests/testHttpRequestMethod.cc +++ b/src/tests/testHttpRequestMethod.cc @@ -3,7 +3,7 @@ #include "squid.h" #include -#include "HttpRequestMethod.h" +#include "http/RequestMethod.h" #include "Mem.h" #include "SquidConfig.h" #include "testHttpRequestMethod.h" -- 2.47.2