moved HttpHeaderTools.cc-related headers to HttpHeaderTools.h

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 9d5411633f3903adb9357dc1f967d37f21aeb565..8e56264a208561c20527d60bc3baeef2a81d621b 100644 (file)
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -34,6 +34,7 @@
 #include "base/StringArea.h"
 #include "HttpHeader.h"
 #include "HttpHeaderStat.h"
+#include "HttpHeaderTools.h"
 #include "HttpHdrCc.h"
 #include "StatHist.h"
 #include "Store.h"

diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc
index eac4a02549310fc12ac83892c22fc4b7537195b9..b9c657cb4026b5f30ca92622aa1e9d15bcd11a92 100644 (file)
--- a/src/HttpHdrSc.cc
+++ b/src/HttpHdrSc.cc
@@ -40,6 +40,7 @@
 #include "HttpHdrSc.h"
 #include "HttpHeader.h"
 #include "HttpHeaderStat.h"
+#include "HttpHeaderTools.h"
 #include "Store.h"
 #include "protos.h"
 

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 9a29cb7be09a7a926efdecdf82a22fabc286cb6c..f35eff3f09ebce620f795bba337d5731e789b278 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -40,6 +40,7 @@
 #include "HttpHdrSc.h"
 #include "HttpHeader.h"
 #include "HttpHeaderStat.h"
+#include "HttpHeaderTools.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"

diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h
index a954607ce047c94780c39b884f19980002068e24..1da330e32bfa1381918a171e3f86a9919b7f31ce 100644 (file)
--- a/src/HttpHeaderTools.h
+++ b/src/HttpHeaderTools.h
@@ -3,6 +3,7 @@
 
 #include "format/Format.h"
 #include "HttpHeader.h"
+#include "typedefs.h"
 
 #if HAVE_LIST
 #include <list>
@@ -91,6 +92,19 @@ public:
     bool quoted;
 };
 
-SQUIDCEXTERN int httpHeaderParseOffset(const char *start, int64_t * off);
+extern int httpHeaderParseOffset(const char *start, int64_t * off);
+
+class HttpHeaderFieldInfo;
+class String;
+
+extern HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count);
+extern void httpHeaderDestroyFieldsInfo(HttpHeaderFieldInfo * info, int count);
+extern http_hdr_type httpHeaderIdByName(const char *name, size_t name_len, const HttpHeaderFieldInfo * attrs, int end);
+extern http_hdr_type httpHeaderIdByNameDef(const char *name, int name_len);
+extern const char *httpHeaderNameById(int id);
+extern int httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive);
+extern int httpHeaderParseInt(const char *start, int *val);
+extern void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
+
 
 #endif

diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc
index 772d35f2f315dd9dc611cd2befca567123dd25f1..2922089ddd392af6aee2ad6127d3a0c039a4c1eb 100644 (file)
--- a/src/HttpMsg.cc
+++ b/src/HttpMsg.cc
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "Debug.h"
+#include "HttpHeaderTools.h"
 #include "HttpMsg.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index 7dd4f4f13fe8d83dc1d630584210f4c189a8655b..9fc7b86757102e38664b720135f6d154fa737a49 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1098,6 +1098,7 @@ tests_testHttpReply_SOURCES=\
        HttpHeader.h \
        HttpHeader.cc \
        HttpHeaderMask.h \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpControlMsg.h \
        HttpMsg.cc \
@@ -1182,6 +1183,7 @@ tests_testACLMaxUserIP_SOURCES= \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHdrContRange.cc \
        HttpHdrRange.cc \
@@ -1386,6 +1388,7 @@ tests_testCacheManager_SOURCES = \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -1550,6 +1553,7 @@ tests_testDiskIO_SOURCES = \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
        HttpHdrRange.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -1747,6 +1751,7 @@ tests_testEvent_SOURCES = \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -1962,6 +1967,7 @@ tests_testEventLoop_SOURCES = \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -2181,6 +2187,7 @@ tests_test_http_range_SOURCES = \
        HttpHdrScTarget.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
        HttpParser.cc \
@@ -2434,6 +2441,7 @@ tests_testHttpRequest_SOURCES = \
        HttpBody.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -2593,6 +2601,7 @@ tests_testStore_SOURCES= \
        HttpHdrRange.cc \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -2852,6 +2861,7 @@ tests_testUfs_SOURCES = \
        mem_node.cc \
        stmem.cc \
        tests/stub_mime.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -2957,6 +2967,7 @@ tests_testRock_SOURCES = \
        HttpHdrScTarget.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
        HttpReply.cc \
@@ -3143,6 +3154,7 @@ tests_testCoss_SOURCES = \
        mem_node.cc \
        stmem.cc \
        tests/stub_mime.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -3290,6 +3302,7 @@ tests_testNull_SOURCES = \
        mem_node.cc \
        stmem.cc \
        tests/stub_mime.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
@@ -3431,6 +3444,7 @@ tests_testURL_SOURCES = \
        HttpHdrScTarget.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       HttpHeaderTools.h \
        HttpHeaderTools.cc \
        HttpMsg.cc \
        HttpParser.cc \

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index fcfc048c0d8d85fb19003cef7762ee930614fcfe..43f138cc8ecfe20bb54ab8bb7a674bba760fb5a6 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -43,6 +43,7 @@
 #include "protos.h"
 #include "wordlist.h"
 #include "ConfigParser.h"
+#include "HttpHeaderTools.h"
 
 /* Construct an ACLHTTPHeaderData that uses an ACLRegex rule with the value of the
  * selected header from a given request.

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 8656661b356c05ac090693ce83736d3d34f68959..e2413c4ec5f25bcf971852c221da8e67f7c7bf2e 100644 (file)
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -20,6 +20,7 @@
 #include "comm.h"
 #include "comm/Connection.h"
 #include "err_detail_type.h"
+#include "HttpHeaderTools.h"
 #include "HttpMsg.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc
index 4607d1543f64c228679e2263a32d5c000c01cc6a..af4aa5a1967d98ac905a9ccca58b477c67f525a7 100644 (file)
--- a/src/adaptation/icap/OptXact.cc
+++ b/src/adaptation/icap/OptXact.cc
@@ -9,6 +9,7 @@
 #include "adaptation/icap/OptXact.h"
 #include "base/TextException.h"
 #include "comm.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "protos.h"

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index d9196b573b92f75fe87a1d32064db195c7ecec48..a303299ae8c9829b1af0bf3f46faa01d77433ccb 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -48,6 +48,7 @@
 #include "charset.h"
 #include "mgr/Registration.h"
 #include "Store.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "protos.h"
 #include "rfc1738.h"

diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc
index 920c7290f0ee9b4309a2e5a9473da824cc2a8ea2..bb37ddf7498487557f666977adc069f25e18a3fe 100644 (file)
--- a/src/auth/digest/UserRequest.cc
+++ b/src/auth/digest/UserRequest.cc
@@ -4,6 +4,7 @@
 #include "auth/digest/UserRequest.h"
 #include "auth/State.h"
 #include "charset.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "protos.h"

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index b0eb7a4cf066fc499bb4b212624bdf28d3f261df..721987be58ea16bcb1bacafdd63239a47257d262 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -49,6 +49,7 @@
 #include "base64.h"
 #include "base/StringArea.h"
 #include "event.h"
+#include "HttpHeaderTools.h"
 #include "mgr/Registration.h"
 #include "Store.h"
 #include "HttpRequest.h"

diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc
index 59c43d7c0a07401e4947cb9e8dee1103b826c7bc..e4903669fa09a96f30a8ed9112a959913b2e0f2e 100644 (file)
--- a/src/auth/negotiate/UserRequest.cc
+++ b/src/auth/negotiate/UserRequest.cc
@@ -6,6 +6,7 @@
 #include "client_side.h"
 #include "globals.h"
 #include "helper.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "protos.h"

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 631e4aba69f1db65f92e80f128d893bf64ff81e8..be858cceee88b757132678432fcbf343ae12a27f 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -45,6 +45,7 @@
 #include "mgr/Registration.h"
 #include "Store.h"
 #include "client_side.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "protos.h"

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index dd1effe24bf5843be6fafba7e22cadfd9766d137..3e7528ae66582b512803cde3a171e6753ffcbde6 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -48,6 +48,7 @@
 #include "mgr/Registration.h"
 #include "Store.h"
 #include "client_side.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "protos.h"

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index a75f1e384c7f8eff8a24a67506a601faef17bbaa..b75377e32a0dd909d1c21b69f4ecb20f70691b5e 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -46,6 +46,7 @@
 #include "ExternalACL.h"
 #include "format/Format.h"
 #include "globals.h"
+#include "HttpHeaderTools.h"
 #include "HttpRequestMethod.h"
 #include "ident/Config.h"
 #include "ip/Intercept.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 1d1c614569d3746063a0ddb2d4b6338c1995968e..9686112333fb8dfae37d0872f4fdc6c13027cbd6 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -107,6 +107,7 @@
 #include "fqdncache.h"
 #include "http.h"
 #include "HttpHdrContRange.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ident/Config.h"

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 9995f5feb20aba6207e55a8a4ec030db57c0beda..856b4c5554fec5fd327d8a8b6ac230db4ac0f1cf 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -46,6 +46,7 @@
 #include "forward.h"
 #include "globals.h"
 #include "globals.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ip/QosConfig.h"

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 556062a176ded2344d38f87d1cde06f464100ce2..d5a34fd98d5aba2cc5b7a2ab513937d8867e3293 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -41,6 +41,7 @@
 #include "ftp.h"
 #include "Store.h"
 #include "html_quote.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "MemObject.h"

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 0b4602c42cf6a707ed5adc2459108f0c2bccd5b0..fc56866fc0a34ce68499da1dbfad248853bdfc3d 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -50,6 +50,7 @@
 #include "ExternalACL.h"
 #include "fde.h"
 #include "helper.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ip/tools.h"

diff --git a/src/http.cc b/src/http.cc
index 6b5a547663538642ade0722292129211f96aa62d..15768c762bc5ba66ee2480532c16b9ed54c7c912 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -56,6 +56,7 @@
 #include "HttpHdrContRange.h"
 #include "HttpHdrSc.h"
 #include "HttpHdrScTarget.h"
+#include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "log/access_log.h"

diff --git a/src/protos.h b/src/protos.h
index 17f0cc1deec64a27afddca7a5023b5b001f7f4bf..1f335c0bb8fab170414bd440f83a852aa7a16e0b 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -58,22 +58,13 @@ class FwdState;
 class HttpRequest;
 class HttpReply;
 
-
-/* Http Header Tools */
-class HttpHeaderFieldInfo;
-SQUIDCEXTERN HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count);
-SQUIDCEXTERN void httpHeaderDestroyFieldsInfo(HttpHeaderFieldInfo * info, int count);
-SQUIDCEXTERN http_hdr_type httpHeaderIdByName(const char *name, size_t name_len, const HttpHeaderFieldInfo * attrs, int end);
-SQUIDCEXTERN http_hdr_type httpHeaderIdByNameDef(const char *name, int name_len);
-SQUIDCEXTERN const char *httpHeaderNameById(int id);
-SQUIDCEXTERN int httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive);
+/* TODO: move to StrList.h */
 SQUIDCEXTERN void strListAdd(String * str, const char *item, char del);
 SQUIDCEXTERN int strListIsMember(const String * str, const char *item, char del);
 SQUIDCEXTERN int strListIsSubstr(const String * list, const char *s, char del);
 SQUIDCEXTERN int strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos);
-SQUIDCEXTERN const char *getStringPrefix(const char *str, const char *end);
-SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val);
-SQUIDCEXTERN void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3;
+
+extern const char *getStringPrefix(const char *str, const char *end);