Moved some http.cc-related prototypes to http.h

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index f8fc40211fe67b8f291e5725ddb03ea452929255..b1a8128a33365131e12f26b5dc473c7a06424c3a 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -41,6 +41,7 @@
 #include "DnsLookupDetails.h"
 #include "err_detail_type.h"
 #include "gopher.h"
+#include "http.h"
 #include "HttpHdrCc.h"
 #include "HttpHeaderRange.h"
 #include "HttpRequest.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index daf94cfd579fae245b3be43bd394e4f695880bc7..1d1c614569d3746063a0ddb2d4b6338c1995968e 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -105,6 +105,7 @@
 #include "fde.h"
 #include "forward.h"
 #include "fqdncache.h"
+#include "http.h"
 #include "HttpHdrContRange.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 861ece467e7521d94ce2b9aeda4a902a5b769544..865735087e1026dbfa9405c91a2b186273916262 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -60,6 +60,7 @@
 #include "fde.h"
 #include "format/Token.h"
 #include "gopher.h"
+#include "http.h"
 #include "HttpHdrCc.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/forward.cc b/src/forward.cc
index f1e5a501e4cf79893d82b703231f91ed85df4b97..1722044a0a299de067e63aaf562b60dc20dce2cd 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -51,6 +51,7 @@
 #include "globals.h"
 #include "gopher.h"
 #include "hier_code.h"
+#include "http.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "icmp/net_db.h"

diff --git a/src/http.h b/src/http.h
index 4cae62d5390de16311b73565a344b30381b2904f..274bd3c53146c7a3936b806df7cbe23663729a36 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -135,4 +135,9 @@ private:
     CBDATA_CLASS2(HttpStateData);
 };
 
+extern int httpCachable(const HttpRequestMethod&);
+extern void httpStart(FwdState *);
+extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply);
+
+
 #endif /* SQUID_HTTP_H */

diff --git a/src/protos.h b/src/protos.h
index b4be86715e2f49b920ec68b4bd8e7211cf0844ba..17f0cc1deec64a27afddca7a5023b5b001f7f4bf 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -59,18 +59,6 @@ class HttpRequest;
 class HttpReply;
 
 
-/* http.c */
-/* for http_hdr_type field */
-SQUIDCEXTERN int httpCachable(const HttpRequestMethod&);
-SQUIDCEXTERN void httpStart(FwdState *);
-SQUIDCEXTERN mb_size_t httpBuildRequestPrefix(HttpRequest * request,
-        HttpRequest * orig_request,
-        StoreEntry * entry,
-        MemBuf * mb,
-        http_state_flags);
-extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply);
-
-
 /* Http Header Tools */
 class HttpHeaderFieldInfo;
 SQUIDCEXTERN HttpHeaderFieldInfo *httpHeaderBuildFieldsInfo(const HttpHeaderFieldAttrs * attrs, int count);