Moved url.cc-related prototypes to URL.h

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 5d656606aaa677998a5c246482124dcb5e90b82d..f8fc40211fe67b8f291e5725ddb03ea452929255 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -48,6 +48,7 @@
 #include "MemBuf.h"
 #include "protos.h"
 #include "Store.h"
+#include "URL.h"
 
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/Server.cc b/src/Server.cc
index 77f584437cf2812b510b72be03a5b905dd9b5df4..43a95ec9ed6f03c53d31256be0ebb2acce4cb60e 100644 (file)
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -48,6 +48,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
+#include "URL.h"
 
 #if USE_ADAPTATION
 #include "adaptation/AccessCheck.h"

diff --git a/src/URL.h b/src/URL.h
index e6e112fffcec15950fb8782ba91a1098efa71e15..ab95fc84f7ae18fc1aa8940cf62c1b1a5886ea7f 100644 (file)
--- a/src/URL.h
+++ b/src/URL.h
@@ -33,6 +33,7 @@
 #ifndef SQUID_SRC_URL_H
 #define SQUID_SRC_URL_H
 
+#include "anyp/ProtocolType.h"
 #include "MemPool.h"
 #include "URLScheme.h"
 
@@ -77,4 +78,24 @@ private:
 
 MEMPROXY_CLASS_INLINE(URL);
 
+class HttpRequest;
+class HttpRequestMethod;
+
+
+extern AnyP::ProtocolType urlParseProtocol(const char *, const char *e = NULL);
+extern void urlInitialize(void);
+extern HttpRequest *urlParse(const HttpRequestMethod&, char *, HttpRequest *request = NULL);
+extern const char *urlCanonical(HttpRequest *);
+extern char *urlCanonicalClean(const HttpRequest *);
+extern const char *urlCanonicalFakeHttps(const HttpRequest * request);
+extern bool urlIsRelative(const char *);
+extern char *urlMakeAbsolute(const HttpRequest *, const char *);
+extern char *urlRInternal(const char *host, unsigned short port, const char *dir, const char *name);
+extern char *urlInternal(const char *dir, const char *name);
+extern int matchDomainName(const char *host, const char *domain);
+extern int urlCheckRequest(const HttpRequest *);
+extern int urlDefaultPort(AnyP::ProtocolType p);
+extern char *urlHostname(const char *url);
+extern void urlExtMethodConfigure(void);
+
 #endif /* SQUID_SRC_URL_H_H */

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index 385d2142c8e264cb9a1a5db8b4bda8c88bc19b6c..f187b6cc9c496c0fa4e1fa699dd67498033d64c7 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -40,6 +40,7 @@
 #include "Debug.h"
 #include "protos.h"
 #include "wordlist.h"
+#include "URL.h"
 
 template<class T>
 inline void

diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index 9457c43c85c7c7fd212006e9bc82ecf66e36b700..7d02415546869d90e58ad593bab9ed0d759a1f12 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -40,6 +40,7 @@
 #include "acl/RegexData.h"
 #include "protos.h"
 #include "rfc1738.h"
+#include "URL.h"
 
 int
 ACLUrlStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)

diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index 302da800ea7f6840e5274f29d14f555b48b4e188..6ee19b894ca6b60bc2c586ff05caaec14ed0b544 100644 (file)
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -13,6 +13,7 @@
 #include "adaptation/ecap/XactionRep.h"
 #include "adaptation/ecap/Host.h" /* for protocol constants */
 #include "base/TextException.h"
+#include "URL.h"
 
 /* HeaderRep */
 

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 49caee611b50ed85913a1b840d259720217458e2..8656661b356c05ac090693ce83736d3d34f68959 100644 (file)
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -25,6 +25,7 @@
 #include "HttpRequest.h"
 #include "protos.h"
 #include "SquidTime.h"
+#include "URL.h"
 
 // flow and terminology:
 //     HTTP| --> receive --> encode --> write --> |network

diff --git a/src/carp.cc b/src/carp.cc
index 53424235c3ca470da2aeb871130d4915e5aeec57..a53a94e472da36a3f67192f94c28ee26c363c6f4 100644 (file)
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -40,6 +40,7 @@
 #include "neighbors.h"
 #include "protos.h"
 #include "Store.h"
+#include "URL.h"
 #include "URLScheme.h"
 
 #if HAVE_MATH_H

diff --git a/src/client_side.cc b/src/client_side.cc
index e0cf5b262f9090314161686dae13a5d9d5e74e38..5dd22e08b0deff964c6b4efeaa542a13cfa5e64e 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -123,6 +123,7 @@
 #include "Store.h"
 #include "TimeOrTag.h"
 #include "tools.h"
+#include "URL.h"
 
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 772e7f309334cd8dbec13b14e8cb8bc7e0487c9a..68faaae426ce8c5128d25bee4d8a41d17a5bf33d 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -57,6 +57,7 @@
 #include "Store.h"
 #include "StoreClient.h"
 #include "tools.h"
+#include "URL.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"
 #endif

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index beea2b2ccf040a268df775139f1ccaa2ed25ef0b..b80142a503009e2147402adc495c51142e2b08b0 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -69,6 +69,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 #include "wordlist.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/errorpage.cc b/src/errorpage.cc
index c9c7f7a5fdd4d1c53b84ccc874bec97a0a5e3b88..d140568b2fb8a5ee9d99403e35f1ff07aec5a944 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -45,7 +45,9 @@
 #include "MemBuf.h"
 #include "protos.h"
 #include "rfc1738.h"
+#include "URL.h"
 #include "URLScheme.h"
+#include "URL.h"
 #include "tools.h"
 #include "wordlist.h"
 #if USE_AUTH

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 0959830eff28a197b903cf03e3ae8bb9d841e942..fa746b8564193befd1172e29bb1cc274caa9b731 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -60,6 +60,7 @@
 #include "Store.h"
 #include "URLScheme.h"
 #include "tools.h"
+#include "URL.h"
 #include "wordlist.h"
 #if USE_SSL
 #include "ssl/support.h"

diff --git a/src/format/Format.cc b/src/format/Format.cc
index abe8e5749f5b623274ee9a4df7cb2d7d79303fdd..0454821e4592f64f87e41802ff8873b70024f9bd 100644 (file)
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -15,6 +15,7 @@
 #include "rfc1738.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 #if USE_SSL
 #include "ssl/ErrorDetail.h"
 #endif

diff --git a/src/ftp.cc b/src/ftp.cc
index f5cea251787b3af810936da638a9ba78229246bb..4efd2727beb18cc64b474d686e66da33490bd6b7 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -58,6 +58,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
+#include "URL.h"
 #include "URLScheme.h"
 #include "wordlist.h"
 

diff --git a/src/htcp.cc b/src/htcp.cc
index 88de49e8c2787ae0461901cde35118f52ccb89e1..97752167739c7a54d353e41daa90e296912fc081 100644 (file)
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -56,6 +56,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "StoreClient.h"
+#include "URL.h"
 
 typedef struct _Countstr Countstr;
 

diff --git a/src/http.cc b/src/http.cc
index 1802b429ed6678a794a5c4b70fc5389896a5e725..c3974b2205c8e3f15d2cdc83b9df2c87a577c70a 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -68,6 +68,7 @@
 #include "StatCounters.h"
 #include "Store.h"
 #include "tools.h"
+#include "URL.h"
 
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 8f956ec517f1898535aa36015b3143edbf5bb8ee..a9da15067c8c5fe2419695659a75aaa33212c52e 100644 (file)
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -57,7 +57,7 @@
 #include "wordlist.h"
 #include "ip/Address.h"
 #include "neighbors.h"
-
+#include "URL.h"
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>

diff --git a/src/internal.cc b/src/internal.cc
index 7812fb5b0eb48dc7e1b0cd0f570344f61b77ebe1..a054b89c90020c75e037240864acfe64bb92b2b8 100644 (file)
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -45,6 +45,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "tools.h"
+#include "URL.h"
 #include "wordlist.h"
 
 /* called when we "miss" on an internal object;

diff --git a/src/main.cc b/src/main.cc
index fb0fb1691a89baa745d52222563e00cc937aea0a..ebb80621c278d55ddf1c365a7063d951fcb5f105 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -81,6 +81,7 @@
 #include "StoreFileSystem.h"
 #include "Store.h"
 #include "SwapDir.h"
+#include "URL.h"
 #include "wccp.h"
 #include "wccp2.h"
 

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 7a27933301844cd54de7627f5c02bf88898d12dc..0522537c4bdbc41dc4a943e174f36b89d2a06a05 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -54,6 +54,7 @@
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 
 /* count mcast group peers every 15 minutes */
 #define MCAST_COUNT_RATE 900

diff --git a/src/protos.h b/src/protos.h
index dda745e5379a92ae2044f754b3cfadfea5fc08a8..08f4682adae353f15b6b473e6b200d605db56ff6 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -421,21 +421,6 @@ SQUIDCEXTERN void unlinkdClose(void);
 SQUIDCEXTERN void unlinkdUnlink(const char *);
 #endif
 
-SQUIDCEXTERN AnyP::ProtocolType urlParseProtocol(const char *, const char *e = NULL);
-SQUIDCEXTERN void urlInitialize(void);
-SQUIDCEXTERN HttpRequest *urlParse(const HttpRequestMethod&, char *, HttpRequest *request = NULL);
-SQUIDCEXTERN const char *urlCanonical(HttpRequest *);
-SQUIDCEXTERN char *urlCanonicalClean(const HttpRequest *);
-SQUIDCEXTERN const char *urlCanonicalFakeHttps(const HttpRequest * request);
-SQUIDCEXTERN bool urlIsRelative(const char *);
-SQUIDCEXTERN char *urlMakeAbsolute(const HttpRequest *, const char *);
-SQUIDCEXTERN char *urlRInternal(const char *host, unsigned short port, const char *dir, const char *name);
-SQUIDCEXTERN char *urlInternal(const char *dir, const char *name);
-SQUIDCEXTERN int matchDomainName(const char *host, const char *domain);
-SQUIDCEXTERN int urlCheckRequest(const HttpRequest *);
-SQUIDCEXTERN int urlDefaultPort(AnyP::ProtocolType p);
-SQUIDCEXTERN char *urlHostname(const char *url);
-SQUIDCEXTERN void urlExtMethodConfigure(void);
 
 SQUIDCEXTERN peer_t parseNeighborType(const char *s);
 

diff --git a/src/refresh.cc b/src/refresh.cc
index 09d23627101624eee7986b96c3fcd4172d29bb9f..6a6340be1f3e7a3d8da6cee1c722caea8bbf1597 100644 (file)
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -46,6 +46,7 @@
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "URL.h"
 
 typedef enum {
     rcHTTP,

diff --git a/src/ssl/ServerBump.cc b/src/ssl/ServerBump.cc
index 13de8021109894c454d3ee15eb2ae1f56c66bc09..d63e789fe036c6aba2067ec1bc45886638a047c8 100644 (file)
--- a/src/ssl/ServerBump.cc
+++ b/src/ssl/ServerBump.cc
@@ -12,7 +12,7 @@
 #include "protos.h"
 #include "ssl/ServerBump.h"
 #include "Store.h"
-
+#include "URL.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Ssl, ServerBump);
 

diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index 3e4244021e404b30cedbdb73f16470b8bffbd0d3..f4a482a28006b19ae297b8b03bd817b7df03d37c 100644 (file)
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -47,6 +47,7 @@
 #include "ssl/ErrorDetail.h"
 #include "ssl/support.h"
 #include "ssl/gadgets.h"
+#include "URL.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc
index 8ebb91fad841eed5d366e40a0858938e7972138c..8e08520f3212b42174911d7efb7ca71d168d496f 100644 (file)
--- a/src/store_key_md5.cc
+++ b/src/store_key_md5.cc
@@ -37,6 +37,7 @@
 #include "HttpRequest.h"
 #include "md5.h"
 #include "protos.h"
+#include "URL.h"
 
 static cache_key null_key[SQUID_MD5_DIGEST_LENGTH];
 

diff --git a/src/urn.cc b/src/urn.cc
index e72cd09932c585199de1aab785721f7299bdaba2..c340583e5f6e518ce4f9a0b39e47caabd7bc3840 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -45,6 +45,7 @@
 #include "SquidTime.h"
 #include "icmp/net_db.h"
 #include "protos.h"
+#include "URL.h"
 
 #define        URN_REQBUF_SZ   4096