From: robertc <>
Date: Sun, 10 Aug 2003 17:00:40 +0000 (+0000)
Subject: Summary: Final MSVC fixups.
X-Git-Tag: SQUID_3_0_PRE3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190154cf6d4d0cd99d468756980c8c6e325718a1;p=thirdparty%2Fsquid.git

Summary: Final MSVC fixups.
Keywords:

* Don't reuse loop variable in errorPageId.
* Remove all uses of request_t - replace with HttpRequest.
---

diff --git a/src/ACLChecklist.h b/src/ACLChecklist.h
index 1c826ce039..2d8a1208bc 100644
--- a/src/ACLChecklist.h
+++ b/src/ACLChecklist.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLChecklist.h,v 1.15 2003/08/04 22:14:38 robertc Exp $
+ * $Id: ACLChecklist.h,v 1.16 2003/08/10 11:00:40 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -118,7 +118,7 @@ class NullState : public AsyncState
 
     struct in_addr my_addr;
     unsigned short my_port;
-    request_t *request;
+    HttpRequest *request;
     /* for acls that look at reply data */
     HttpReply *reply;
     char rfc931[USER_IDENT_SZ];
@@ -152,7 +152,7 @@ private:
 };
 
 SQUIDCEXTERN ACLChecklist *aclChecklistCreate(const acl_access *,
-        request_t *,
+        HttpRequest *,
         const char *ident);
 SQUIDCEXTERN int aclCheckFast(const acl_access *A, ACLChecklist *);
 
diff --git a/src/DelayId.cc b/src/DelayId.cc
index c29cec4af0..81369453c0 100644
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayId.cc,v 1.12 2003/07/11 01:40:34 robertc Exp $
+ * $Id: DelayId.cc,v 1.13 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -93,7 +93,7 @@ DelayId::operator bool() const
 DelayId
 DelayId::DelayClient(clientHttpRequest * http)
 {
-    request_t *r;
+    HttpRequest *r;
     unsigned short pool;
     assert(http);
     r = http->request;
diff --git a/src/ESI.cc b/src/ESI.cc
index bf0f52bd9a..858edf394c 100644
--- a/src/ESI.cc
+++ b/src/ESI.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.cc,v 1.5 2003/08/04 22:14:40 robertc Exp $
+ * $Id: ESI.cc,v 1.6 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -1455,7 +1455,7 @@ ESIContext::freeResources ()
     /* don't touch incoming, it's a pointer into buffered anyway */
 }
 
-extern ErrorState *clientBuildError (err_type, http_status, char const *, struct in_addr *, request_t *);
+extern ErrorState *clientBuildError (err_type, http_status, char const *, struct in_addr *, HttpRequest *);
 
 
 /* This can ONLY be used before we have sent *any* data to the client */
diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 99f02802bd..5dc15c8c59 100644
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeaderTools.cc,v 1.43 2003/07/23 10:41:20 robertc Exp $
+ * $Id: HttpHeaderTools.cc,v 1.44 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 66    HTTP Header Tools
  * AUTHOR: Alex Rousskov
@@ -504,7 +504,7 @@ httpHeaderStrCmp(const char *h1, const char *h2, int len)
  * Returns 1 if the header is allowed.
  */
 static int
-httpHdrMangle(HttpHeaderEntry * e, request_t * request)
+httpHdrMangle(HttpHeaderEntry * e, HttpRequest * request)
 {
     int retval;
 
@@ -536,7 +536,7 @@ httpHdrMangle(HttpHeaderEntry * e, request_t * request)
 
 /* Mangles headers for a list of headers. */
 void
-httpHdrMangleList(HttpHeader * l, request_t * request)
+httpHdrMangleList(HttpHeader * l, HttpRequest * request)
 {
     HttpHeaderEntry *e;
     HttpHeaderPos p = HttpHeaderInitPos;
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 591536b40f..22e0d571c4 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequest.cc,v 1.42 2003/08/04 22:14:40 robertc Exp $
+ * $Id: HttpRequest.cc,v 1.43 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 73    HTTP Request
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "HttpHeaderRange.h"
 
-static void httpRequestHdrCacheInit(request_t * req);
+static void httpRequestHdrCacheInit(HttpRequest * req);
 MemPool (*HttpRequest::Pool)(NULL);
 
 void *
@@ -99,10 +99,10 @@ HttpRequest::HttpRequest()  : header(hoRequest)
 #endif
 }
 
-request_t *
+HttpRequest *
 requestCreate(method_t method, protocol_t protocol, const char *aUrlpath)
 {
-    request_t *req = new HttpRequest;
+    HttpRequest *req = new HttpRequest;
     req->method = method;
     req->protocol = protocol;
 
@@ -123,7 +123,7 @@ requestCreate(method_t method, protocol_t protocol, const char *aUrlpath)
 }
 
 void
-requestDestroy(request_t * req)
+requestDestroy(HttpRequest * req)
 {
     assert(req);
 
@@ -158,8 +158,8 @@ requestDestroy(request_t * req)
     delete req;
 }
 
-request_t *
-requestLink(request_t * request)
+HttpRequest *
+requestLink(HttpRequest * request)
 {
     assert(request);
     request->link_count++;
@@ -167,7 +167,7 @@ requestLink(request_t * request)
 }
 
 void
-requestUnlink(request_t * request)
+requestUnlink(HttpRequest * request)
 {
     if (!request)
         return;
@@ -181,7 +181,7 @@ requestUnlink(request_t * request)
 }
 
 int
-httpRequestParseHeader(request_t * req, const char *parse_start)
+httpRequestParseHeader(HttpRequest * req, const char *parse_start)
 {
     const char *blk_start, *blk_end;
 
@@ -198,7 +198,7 @@ httpRequestParseHeader(request_t * req, const char *parse_start)
 
 /* swaps out request using httpRequestPack */
 void
-httpRequestSwapOut(const request_t * req, StoreEntry * e)
+httpRequestSwapOut(const HttpRequest * req, StoreEntry * e)
 {
     Packer p;
     assert(req && e);
@@ -209,7 +209,7 @@ httpRequestSwapOut(const request_t * req, StoreEntry * e)
 
 /* packs request-line and headers, appends <crlf> terminator */
 void
-httpRequestPack(const request_t * req, Packer * p)
+httpRequestPack(const HttpRequest * req, Packer * p)
 {
     assert(req && p);
     /* pack request-line */
@@ -223,7 +223,7 @@ httpRequestPack(const request_t * req, Packer * p)
 
 #if UNUSED_CODE
 void
-httpRequestSetHeaders(request_t * req, method_t method, const char *uri, const char *header_str)
+httpRequestSetHeaders(HttpRequest * req, method_t method, const char *uri, const char *header_str)
 {
     assert(req && uri && header_str);
     assert(!req->header.len);
@@ -234,7 +234,7 @@ httpRequestSetHeaders(request_t * req, method_t method, const char *uri, const c
 
 /* returns the length of request line + headers + crlf */
 int
-httpRequestPrefixLen(const request_t * req)
+httpRequestPrefixLen(const HttpRequest * req)
 {
     assert(req);
     return strlen(RequestMethodStr[req->method]) + 1 +
@@ -259,9 +259,9 @@ httpRequestHdrAllowed(const HttpHeaderEntry * e, String * strConn)
     return 1;
 }
 
-/* sync this routine when you update request_t struct */
+/* sync this routine when you update HttpRequest struct */
 static void
-httpRequestHdrCacheInit(request_t * req)
+httpRequestHdrCacheInit(HttpRequest * req)
 {
     const HttpHeader *hdr = &req->header;
     /*  const char *str; */
@@ -316,7 +316,7 @@ request_flags::clearResetTCP()
 }
 
 bool
-request_t::multipartRangeRequest() const
+HttpRequest::multipartRangeRequest() const
 {
     return (range && range->specs.count > 1);
 }
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 20d79bc250..10224f4f27 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpRequest.h,v 1.6 2003/08/04 22:14:41 robertc Exp $
+ * $Id: HttpRequest.h,v 1.7 2003/08/10 11:00:40 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,14 +39,14 @@
 #include "client_side.h"
 
 /*  Http Request */
-extern request_t *requestCreate(method_t, protocol_t, const char *urlpath);
-extern void requestDestroy(request_t *);
-extern request_t *requestLink(request_t *);
-extern void requestUnlink(request_t *);
-extern int httpRequestParseHeader(request_t * req, const char *parse_start);
-extern void httpRequestSwapOut(const request_t * req, StoreEntry * e);
-extern void httpRequestPack(const request_t * req, Packer * p);
-extern int httpRequestPrefixLen(const request_t * req);
+extern HttpRequest *requestCreate(method_t, protocol_t, const char *urlpath);
+extern void requestDestroy(HttpRequest *);
+extern HttpRequest *requestLink(HttpRequest *);
+extern void requestUnlink(HttpRequest *);
+extern int httpRequestParseHeader(HttpRequest * req, const char *parse_start);
+extern void httpRequestSwapOut(const HttpRequest * req, StoreEntry * e);
+extern void httpRequestPack(const HttpRequest * req, Packer * p);
+extern int httpRequestPrefixLen(const HttpRequest * req);
 extern int httpRequestHdrAllowed(const HttpHeaderEntry * e, String * strConnection);
 extern int httpRequestHdrAllowedByName(http_hdr_type id);
 
@@ -104,6 +104,4 @@ private:
     static MemPool *Pool;
 };
 
-typedef HttpRequest request_t;
-
 #endif /* SQUID_HTTPREQUEST_H */
diff --git a/src/ICP.h b/src/ICP.h
index c41d1da4a4..a7ebcd323e 100644
--- a/src/ICP.h
+++ b/src/ICP.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICP.h,v 1.5 2003/03/09 12:29:40 robertc Exp $
+ * $Id: ICP.h,v 1.6 2003/08/10 11:00:40 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -80,7 +80,7 @@ public:
     ICPState(icp_common_t &);
     virtual ~ ICPState();
     icp_common_t header;
-    request_t *request;
+    HttpRequest *request;
     int fd;
 
     struct sockaddr_in from;
@@ -109,11 +109,11 @@ struct _icpUdpData
 };
 
 
-request_t *
+HttpRequest *
 
 icpGetRequest(char *url, int reqnum, int fd, struct sockaddr_in *from);
 
-int icpAccessAllowed(struct sockaddr_in *from, request_t * icp_request);
+int icpAccessAllowed(struct sockaddr_in *from, HttpRequest * icp_request);
 
 SQUIDCEXTERN void icpCreateAndSend(icp_opcode, int flags, char const *url, int reqnum, int pad, int fd, const struct sockaddr_in *from);
 extern icp_opcode icpGetCommonOpcode();
@@ -126,7 +126,7 @@ SQUIDCEXTERN PF icpHandleUdp;
 SQUIDCEXTERN PF icpUdpSendQueue;
 
 SQUIDCEXTERN void icpHandleIcpV3(int, struct sockaddr_in, char *, int);
-SQUIDCEXTERN int icpCheckUdpHit(StoreEntry *, request_t * request);
+SQUIDCEXTERN int icpCheckUdpHit(StoreEntry *, HttpRequest * request);
 SQUIDCEXTERN void icpConnectionsOpen(void);
 SQUIDCEXTERN void icpConnectionShutdown(void);
 SQUIDCEXTERN void icpConnectionClose(void);
diff --git a/src/MemObject.h b/src/MemObject.h
index 5833ecfb98..5149d2842e 100644
--- a/src/MemObject.h
+++ b/src/MemObject.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MemObject.h,v 1.7 2003/08/10 05:11:22 robertc Exp $
+ * $Id: MemObject.h,v 1.8 2003/08/10 11:00:40 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -112,7 +112,7 @@ public:
     SwapOut swapout;
     /* Read only - this reply must be preserved by store clients */
     /* The original reply. possibly with updated metadata. */
-    request_t *request;
+    HttpRequest *request;
 
     struct timeval start_ping;
     IRCB *ping_reply_callback;
diff --git a/src/Store.h b/src/Store.h
index 696a73af14..bc58c59428 100644
--- a/src/Store.h
+++ b/src/Store.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Store.h,v 1.11 2003/07/22 15:23:01 robertc Exp $
+ * $Id: Store.h,v 1.12 2003/08/10 11:00:40 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -69,7 +69,7 @@ public:
     void delayAwareRead(int fd, char *buf, int len, IOCB *handler, void *data);
 
     void setNoDelay (bool const);
-    bool modifiedSince(request_t * request) const;
+    bool modifiedSince(HttpRequest * request) const;
 
     MemObject *mem_obj;
     RemovalPolicyNode repl;
@@ -104,8 +104,8 @@ swap_status_t swap_status:
 
 public:
     static size_t inUseCount();
-    static void getPublicByRequestMethod(StoreClient * aClient, request_t * request, const method_t method);
-    static void getPublicByRequest(StoreClient * aClient, request_t * request);
+    static void getPublicByRequestMethod(StoreClient * aClient, HttpRequest * request, const method_t method);
+    static void getPublicByRequest(StoreClient * aClient, HttpRequest * request);
     static void getPublic(StoreClient * aClient, const char *uri, const method_t method);
 
     virtual bool isNull()
@@ -169,8 +169,8 @@ extern void storeEntryReplaceObject(StoreEntry *, HttpReply *);
 SQUIDCEXTERN StoreEntry *new_StoreEntry(int, const char *, const char *);
 SQUIDCEXTERN StoreEntry *storeGet(const cache_key *);
 SQUIDCEXTERN StoreEntry *storeGetPublic(const char *uri, const method_t method);
-SQUIDCEXTERN StoreEntry *storeGetPublicByRequest(request_t * request);
-SQUIDCEXTERN StoreEntry *storeGetPublicByRequestMethod(request_t * request, const method_t method);
+SQUIDCEXTERN StoreEntry *storeGetPublicByRequest(HttpRequest * request);
+SQUIDCEXTERN StoreEntry *storeGetPublicByRequestMethod(HttpRequest * request, const method_t method);
 SQUIDCEXTERN StoreEntry *storeCreateEntry(const char *, const char *, request_flags, method_t);
 SQUIDCEXTERN void storeSetPublicKey(StoreEntry *);
 SQUIDCEXTERN void storeCreateMemObject(StoreEntry *, const char *, const char *);
diff --git a/src/access_log.cc b/src/access_log.cc
index 773d774f15..d283ba1e28 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: access_log.cc,v 1.91 2003/07/28 08:57:49 adrian Exp $
+ * $Id: access_log.cc,v 1.92 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 46    Access Log
  * AUTHOR: Duane Wessels
@@ -1659,7 +1659,7 @@ void
 headersLog(int cs, int pq, method_t m, void *data)
 {
     HttpReply *rep;
-    request_t *req;
+    HttpRequest *req;
     unsigned short magic = 0;
     unsigned char M = (unsigned char) m;
     unsigned short S;
diff --git a/src/acl.cc b/src/acl.cc
index 40d7fe393f..3b80f4b456 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.310 2003/08/04 22:14:41 robertc Exp $
+ * $Id: acl.cc,v 1.311 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -523,7 +523,7 @@ aclCheckFast(const acl_access * A, ACLChecklist * checklist)
 
 
 ACLChecklist *
-aclChecklistCreate(const acl_access * A, request_t * request, const char *ident)
+aclChecklistCreate(const acl_access * A, HttpRequest * request, const char *ident)
 {
     ACLChecklist *checklist = new ACLChecklist;
 
diff --git a/src/asn.cc b/src/asn.cc
index a9a3c648e7..42b8f7ddd1 100644
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: asn.cc,v 1.96 2003/08/04 22:14:41 robertc Exp $
+ * $Id: asn.cc,v 1.97 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -79,7 +79,7 @@ struct _ASState
 {
     StoreEntry *entry;
     store_client *sc;
-    request_t *request;
+    HttpRequest *request;
     int as_number;
     off_t offset;
     int reqofs;
@@ -215,7 +215,7 @@ asnCacheStart(int as)
 {
     LOCAL_ARRAY(char, asres, 4096);
     StoreEntry *e;
-    request_t *req;
+    HttpRequest *req;
     ASState *asState;
     asState = cbdataAlloc(ASState);
     asState->dataRead = 0;
diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 88dc120206..022791c6a7 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: auth_basic.cc,v 1.27 2003/07/14 14:16:21 robertc Exp $
+ * $Id: auth_basic.cc,v 1.28 2003/08/10 11:00:48 robertc Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Duane Wessels
@@ -183,7 +183,7 @@ authenticateBasiccmpUsername(basic_data * u1, basic_data * u2)
 /* log a basic user in
  */
 static void
-authenticateBasicAuthenticateUser(auth_user_request_t * auth_user_request, request_t * request, ConnStateData::Pointer conn, http_hdr_type type)
+authenticateBasicAuthenticateUser(auth_user_request_t * auth_user_request, HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type)
 {
     auth_user_t *auth_user;
     basic_data *basic_auth;
@@ -246,7 +246,7 @@ authenticateBasicDirection(auth_user_request_t * auth_user_request)
 }
 
 void
-authenticateBasicFixErrorHeader(auth_user_request_t * auth_user_request, HttpReply * rep, http_hdr_type type, request_t * request)
+authenticateBasicFixErrorHeader(auth_user_request_t * auth_user_request, HttpReply * rep, http_hdr_type type, HttpRequest * request)
 {
     if (basicConfig->authenticate) {
         debug(29, 9) ("authenticateFixErrorHeader: Sending type:%d header: 'Basic realm=\"%s\"'\n", type, basicConfig->basicAuthRealm);
diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 4d01086521..84374372d2 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.30 2003/08/10 07:27:34 hno Exp $
+ * $Id: auth_digest.cc,v 1.31 2003/08/10 11:00:48 robertc Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -645,7 +645,7 @@ digest_request_h::authenticated() const
 /* log a digest user in
  */
 void
-digest_request_h::authenticate(request_t * request, ConnStateData::Pointer conn, http_hdr_type type)
+digest_request_h::authenticate(HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type)
 {
     auth_user_t *auth_user;
     digest_request_h *digest_request;
@@ -840,7 +840,7 @@ authDigestAddTrailer(auth_user_request_t * auth_user_request, HttpReply * rep, i
 
 /* add the [www-|Proxy-]authenticate header on a 407 or 401 reply */
 void
-authenticateDigestFixHeader(auth_user_request_t * auth_user_request, HttpReply * rep, http_hdr_type type, request_t * request)
+authenticateDigestFixHeader(auth_user_request_t * auth_user_request, HttpReply * rep, http_hdr_type type, HttpRequest * request)
 {
     if (!digestConfig->authenticate)
         return;
diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index bb97c24b5d..99996d1d6b 100644
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -58,7 +58,7 @@ public:
     ~digest_request_h();
 
     int authenticated() const;
-    virtual void authenticate(request_t * request, ConnStateData::Pointer conn, http_hdr_type type);
+    virtual void authenticate(HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type);
     virtual int direction();
     virtual void addHeader(HttpReply * rep, int accel);
 
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index de59eb232c..8c9aaa4364 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.36 2003/08/04 22:14:53 robertc Exp $
+ * $Id: auth_ntlm.cc,v 1.37 2003/08/10 11:00:52 robertc Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins
@@ -363,7 +363,7 @@ ntlm_request_t::direction()
  * else.
  */
 static void
-authenticateNTLMFixErrorHeader(auth_user_request_t * auth_user_request, HttpReply * rep, http_hdr_type type, request_t * request)
+authenticateNTLMFixErrorHeader(auth_user_request_t * auth_user_request, HttpReply * rep, http_hdr_type type, HttpRequest * request)
 {
     ntlm_request_t *ntlm_request;
 
@@ -1065,13 +1065,13 @@ ntlm_request_t::authenticated() const
 }
 
 void
-ntlm_request_t::authenticate(request_t * request, ConnStateData::Pointer conn, http_hdr_type type)
+ntlm_request_t::authenticate(HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type)
 {
     fatal ("unusable");
 }
 
 static void
-authenticateNTLMAuthenticateUser(auth_user_request_t * auth_user_request, request_t * request, ConnStateData::Pointer conn, http_hdr_type type)
+authenticateNTLMAuthenticateUser(auth_user_request_t * auth_user_request, HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type)
 {
     const char *proxy_auth;
 
diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index a0a1b4eb55..762170e47c 100644
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -45,7 +45,7 @@ public:
 
     ~ntlm_request_t();
     virtual int authenticated() const;
-    virtual void authenticate(request_t * request, ConnStateData::Pointer conn, http_hdr_type type);
+    virtual void authenticate(HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type);
     virtual int direction();
     /* what negotiate string did the client use? */
     char *ntlmnegotiate;
diff --git a/src/authenticate.cc b/src/authenticate.cc
index 53c2fea52b..fe0e543b72 100644
--- a/src/authenticate.cc
+++ b/src/authenticate.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: authenticate.cc,v 1.62 2003/08/04 22:14:41 robertc Exp $
+ * $Id: authenticate.cc,v 1.63 2003/08/10 11:00:40 robertc Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR:  Robert Collins
@@ -538,7 +538,7 @@ authenticateUserAuthenticated(auth_user_request_t * auth_user_request)
  * This is basically a handle approach.
  */
 static void
-authenticateAuthenticateUser(auth_user_request_t * auth_user_request, request_t * request, ConnStateData::Pointer &conn, http_hdr_type type)
+authenticateAuthenticateUser(auth_user_request_t * auth_user_request, HttpRequest * request, ConnStateData::Pointer &conn, http_hdr_type type)
 {
     assert(auth_user_request != NULL);
 
@@ -584,7 +584,7 @@ authTryGetUser (auth_user_request_t **auth_user_request, ConnStateData::Pointer
  */
 auth_acl_t
 
-AuthUserRequest::authenticate(auth_user_request_t ** auth_user_request, http_hdr_type headertype, request_t * request, ConnStateData::Pointer conn, struct in_addr src_addr)
+AuthUserRequest::authenticate(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct in_addr src_addr)
 {
     const char *proxy_auth;
     assert(headertype != 0);
@@ -794,7 +794,7 @@ AuthUserRequest::authenticate(auth_user_request_t ** auth_user_request, http_hdr
 
 auth_acl_t
 
-AuthUserRequest::tryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_user_request, http_hdr_type headertype, request_t * request, ConnStateData::Pointer conn, struct in_addr src_addr)
+AuthUserRequest::tryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct in_addr src_addr)
 {
     /* If we have already been called, return the cached value */
     auth_user_request_t *t = authTryGetUser (auth_user_request, conn);
@@ -822,7 +822,7 @@ AuthUserRequest::tryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_use
 
 auth_acl_t
 
-authenticateTryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_user_request, http_hdr_type headertype, request_t * request, ConnStateData::Pointer conn, struct in_addr src_addr)
+authenticateTryToAuthenticateAndSetAuthUser(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct in_addr src_addr)
 {
     return AuthUserRequest::tryToAuthenticateAndSetAuthUser (auth_user_request, headertype,request, conn, src_addr);
 }
@@ -938,7 +938,7 @@ authenticateShutdown(void)
 }
 
 void
-AuthUserRequest::addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_user_request, request_t * request, int accelerated, int internal)
+AuthUserRequest::addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated, int internal)
 /* send the auth types we are configured to support (and have compiled in!) */
 {
     http_hdr_type type;
@@ -1003,7 +1003,7 @@ AuthUserRequest::addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_
 }
 
 void
-authenticateFixHeader(HttpReply * rep, auth_user_request_t * auth_user_request, request_t * request, int accelerated, int internal)
+authenticateFixHeader(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated, int internal)
 {
     AuthUserRequest::addReplyAuthHeader(rep, auth_user_request, request, accelerated, internal);
 }
@@ -1011,7 +1011,7 @@ authenticateFixHeader(HttpReply * rep, auth_user_request_t * auth_user_request,
 
 /* call the active auth module and allow it to add a trailer to the request */
 void
-authenticateAddTrailer(HttpReply * rep, auth_user_request_t * auth_user_request, request_t * request, int accelerated)
+authenticateAddTrailer(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated)
 {
     if ((auth_user_request != NULL) && (auth_user_request->auth_user->auth_module > 0)
             && (authscheme_list[auth_user_request->auth_user->auth_module - 1].AddTrailer))
diff --git a/src/authenticate.h b/src/authenticate.h
index ad84cffd03..930c3efb75 100644
--- a/src/authenticate.h
+++ b/src/authenticate.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: authenticate.h,v 1.12 2003/08/04 22:14:41 robertc Exp $
+ * $Id: authenticate.h,v 1.13 2003/08/10 11:00:42 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -121,7 +121,7 @@ public:
     virtual ~AuthUserRequestState(){}
 
     virtual int authenticated() const = 0;
-    virtual void authenticate(request_t * request, ConnStateData::Pointer conn, http_hdr_type type) = 0;
+    virtual void authenticate(HttpRequest * request, ConnStateData::Pointer conn, http_hdr_type type) = 0;
     virtual int direction() = 0;
     virtual void addHeader(HttpReply * rep, int accel) {}}
 
@@ -141,8 +141,8 @@ public:
 
 public:
 
-    static auth_acl_t tryToAuthenticateAndSetAuthUser(auth_user_request_t **, http_hdr_type, request_t *, ConnStateData::Pointer, struct in_addr);
-    static void addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_user_request, request_t * request, int accelerated, int internal);
+    static auth_acl_t tryToAuthenticateAndSetAuthUser(auth_user_request_t **, http_hdr_type, HttpRequest *, ConnStateData::Pointer, struct in_addr);
+    static void addReplyAuthHeader(HttpReply * rep, auth_user_request_t * auth_user_request, HttpRequest * request, int accelerated, int internal);
 
     ~AuthUserRequest();
     void *operator new (size_t byteCount);
@@ -161,7 +161,7 @@ public:
 
 private:
 
-    static auth_acl_t authenticate(auth_user_request_t ** auth_user_request, http_hdr_type headertype, request_t * request, ConnStateData::Pointer conn, struct in_addr src_addr);
+    static auth_acl_t authenticate(auth_user_request_t ** auth_user_request, http_hdr_type headertype, HttpRequest * request, ConnStateData::Pointer conn, struct in_addr src_addr);
 
     static auth_user_request_t *createAuthUser (const char *proxy_auth);
 
@@ -189,12 +189,12 @@ private:
 /* authenticate.c authenticate scheme routines typedefs */
 typedef int AUTHSACTIVE(void);
 typedef int AUTHSAUTHED(auth_user_request_t *);
-typedef void AUTHSAUTHUSER(auth_user_request_t *, request_t *, ConnStateData::Pointer, http_hdr_type);
+typedef void AUTHSAUTHUSER(auth_user_request_t *, HttpRequest *, ConnStateData::Pointer, http_hdr_type);
 typedef int AUTHSCONFIGURED(void);
 typedef void AUTHSDECODE(auth_user_request_t *, const char *);
 typedef int AUTHSDIRECTION(auth_user_request_t *);
 typedef void AUTHSDUMP(StoreEntry *, const char *, authScheme *);
-typedef void AUTHSFIXERR(auth_user_request_t *, HttpReply *, http_hdr_type, request_t *);
+typedef void AUTHSFIXERR(auth_user_request_t *, HttpReply *, http_hdr_type, HttpRequest *);
 typedef void AUTHSADDTRAILER(auth_user_request_t *, HttpReply *, int);
 typedef void AUTHSFREE(auth_user_t *);
 typedef void AUTHSFREECONFIG(authScheme *);
@@ -216,7 +216,7 @@ extern auth_user_t *authenticateAuthUserNew(const char *);
 /* AuthUserRequest */
 extern void authenticateStart(auth_user_request_t *, RH *, void *);
 
-extern auth_acl_t authenticateTryToAuthenticateAndSetAuthUser(auth_user_request_t **, http_hdr_type, request_t *, ConnStateData::Pointer, struct in_addr);
+extern auth_acl_t authenticateTryToAuthenticateAndSetAuthUser(auth_user_request_t **, http_hdr_type, HttpRequest *, ConnStateData::Pointer, struct in_addr);
 extern void authenticateSetDenyMessage (auth_user_request_t *, char const *);
 extern size_t authenticateRequestRefCount (auth_user_request_t *);
 extern char const *authenticateAuthUserRequestMessage(auth_user_request_t *);
@@ -225,8 +225,8 @@ extern int authenticateAuthSchemeId(const char *typestr);
 extern void authenticateSchemeInit(void);
 extern void authenticateInit(authConfig *);
 extern void authenticateShutdown(void);
-extern void authenticateFixHeader(HttpReply *, auth_user_request_t *, request_t *, int, int);
-extern void authenticateAddTrailer(HttpReply *, auth_user_request_t *, request_t *, int);
+extern void authenticateFixHeader(HttpReply *, auth_user_request_t *, HttpRequest *, int, int);
+extern void authenticateAddTrailer(HttpReply *, auth_user_request_t *, HttpRequest *, int);
 extern void authenticateAuthUserUnlock(auth_user_t * auth_user);
 extern void authenticateAuthUserLock(auth_user_t * auth_user);
 extern void authenticateAuthUserRequestUnlock(auth_user_request_t *);
diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index 4ea875b224..4785ad82ce 100644
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_manager.cc,v 1.29 2003/02/21 22:50:06 robertc Exp $
+ * $Id: cache_manager.cc,v 1.30 2003/08/10 11:00:42 robertc Exp $
  *
  * DEBUG: section 16    Cache Manager Objects
  * AUTHOR: Duane Wessels
@@ -76,7 +76,7 @@ action_table;
 
 static action_table *cachemgrFindAction(const char *action);
 static cachemgrStateData *cachemgrParseUrl(const char *url);
-static void cachemgrParseHeaders(cachemgrStateData * mgr, const request_t * request);
+static void cachemgrParseHeaders(cachemgrStateData * mgr, const HttpRequest * request);
 static int cachemgrCheckPassword(cachemgrStateData *);
 static void cachemgrStateFree(cachemgrStateData * mgr);
 static char *cachemgrPasswdGet(cachemgr_passwd *, const char *);
@@ -175,7 +175,7 @@ cachemgrParseUrl(const char *url)
 }
 
 static void
-cachemgrParseHeaders(cachemgrStateData * mgr, const request_t * request)
+cachemgrParseHeaders(cachemgrStateData * mgr, const HttpRequest * request)
 {
     const char *basic_cookie;	/* base 64 _decoded_ user:passwd pair */
     const char *passwd_del;
@@ -241,7 +241,7 @@ cachemgrStateFree(cachemgrStateData * mgr)
 }
 
 void
-cachemgrStart(int fd, request_t * request, StoreEntry * entry)
+cachemgrStart(int fd, HttpRequest * request, StoreEntry * entry)
 {
     cachemgrStateData *mgr = NULL;
     ErrorState *err = NULL;
diff --git a/src/carp.cc b/src/carp.cc
index 5927024584..ef383fda84 100644
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: carp.cc,v 1.23 2003/02/21 22:50:07 robertc Exp $
+ * $Id: carp.cc,v 1.24 2003/08/10 11:00:42 robertc Exp $
  *
  * DEBUG: section 39    Cache Array Routing Protocol
  * AUTHOR: Henrik Nordstrom
@@ -154,7 +154,7 @@ carpInit(void)
 }
 
 peer *
-carpSelectParent(request_t * request)
+carpSelectParent(HttpRequest * request)
 {
     int k;
     const char *c;
diff --git a/src/client_side.cc b/src/client_side.cc
index 9a99d7fda5..583569c8f1 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.653 2003/08/10 03:59:19 robertc Exp $
+ * $Id: client_side.cc,v 1.654 2003/08/10 11:00:42 robertc Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -132,7 +132,7 @@ static IDCB clientIdentDone;
 static CSCB clientSocketRecipient;
 static CSD clientSocketDetach;
 static void clientSetKeepaliveFlag(clientHttpRequest *);
-static int clientIsContentLengthValid(request_t * r);
+static int clientIsContentLengthValid(HttpRequest * r);
 static bool okToAccept();
 static int clientIsRequestBodyValid(int bodyLength);
 static int clientIsRequestBodyTooLargeForPolicy(size_t bodyLength);
@@ -152,14 +152,14 @@ private:
     ConnStateData::Pointer conn;
     char *buf;
     CBCB *callback;
-    request_t *request;
+    HttpRequest *request;
 };
 
 static void clientUpdateStatHistCounters(log_type logType, int svc_time);
 static void clientUpdateStatCounters(log_type logType);
 static void clientUpdateHierCounters(HierarchyLogEntry *);
 static bool clientPingHasFinished(ping_data const *aPing);
-static void clientPrepareLogWithRequestDetails(request_t *, AccessLogEntry *);
+static void clientPrepareLogWithRequestDetails(HttpRequest *, AccessLogEntry *);
 static int connIsUsable(ConnStateData::Pointer conn);
 static int responseFinishedOrFailed(HttpReply * rep, StoreIOBuffer const &recievedData);
 static void ClientSocketContextPushDeferredIfNeeded(ClientSocketContext::Pointer deferredRequest, ConnStateData::Pointer & conn);
@@ -457,7 +457,7 @@ ClientHttpRequest::updateCounters()
 }
 
 void
-clientPrepareLogWithRequestDetails(request_t * request, AccessLogEntry * aLogEntry)
+clientPrepareLogWithRequestDetails(HttpRequest * request, AccessLogEntry * aLogEntry)
 {
     assert(request);
     assert(aLogEntry);
@@ -645,7 +645,7 @@ ConnStateData::~ConnStateData()
 static void
 clientSetKeepaliveFlag(clientHttpRequest * http)
 {
-    request_t *request = http->request;
+    HttpRequest *request = http->request;
     const HttpHeader *req_hdr = &request->header;
 
     debug(33, 3) ("clientSetKeepaliveFlag: http_ver = %d.%d\n",
@@ -666,7 +666,7 @@ clientSetKeepaliveFlag(clientHttpRequest * http)
 }
 
 static int
-clientIsContentLengthValid(request_t * r)
+clientIsContentLengthValid(HttpRequest * r)
 {
     switch (r->method) {
 
@@ -1059,7 +1059,7 @@ ClientSocketContext::buildRangeHeader(HttpReply * rep)
 {
     HttpHeader *hdr = rep ? &rep->header : 0;
     const char *range_err = NULL;
-    request_t *request = http->request;
+    HttpRequest *request = http->request;
     assert(request->range);
     /* check if we still want to do ranges */
 
@@ -2091,7 +2091,7 @@ static void
 clientProcessRequest(ConnStateData::Pointer &conn, ClientSocketContext *context, method_t method, char *prefix, size_t req_line_sz)
 {
     clientHttpRequest *http = context->http;
-    request_t *request = NULL;
+    HttpRequest *request = NULL;
     /* We have an initial client stream in place should it be needed */
     /* setup our private context */
     connNoteUseOfBuffer(conn, http->req_sz);
@@ -2383,7 +2383,7 @@ clientReadRequest(int fd, char *buf, size_t size, comm_err_t flag, int xerrno,
 
 /* file_read like function, for reading body content */
 void
-clientReadBody(request_t * request, char *buf, size_t size, CBCB * callback,
+clientReadBody(HttpRequest * request, char *buf, size_t size, CBCB * callback,
                void *cbdata)
 {
     ConnStateData::Pointer conn = request->body_connection;
@@ -2517,7 +2517,7 @@ clientReadBodyAbortHandler(char *buf, ssize_t size, void *data)
 
 /* Abort a body request */
 int
-clientAbortBody(request_t * request)
+clientAbortBody(HttpRequest * request)
 {
     ConnStateData::Pointer conn = request->body_connection;
     char *buf;
@@ -2967,7 +2967,7 @@ clientHttpConnectionsClose(void)
 }
 
 int
-varyEvaluateMatch(StoreEntry * entry, request_t * request)
+varyEvaluateMatch(StoreEntry * entry, HttpRequest * request)
 {
     const char *vary = request->vary_headers;
     int has_vary = httpHeaderHas(&entry->getReply()->header, HDR_VARY);
diff --git a/src/client_side.h b/src/client_side.h
index 0b17235a4a..3c496d54d6 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.h,v 1.7 2003/08/10 03:59:19 robertc Exp $
+ * $Id: client_side.h,v 1.8 2003/08/10 11:00:42 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -161,7 +161,7 @@ public:
     struct
     {
         size_t size_left;	/* How much body left to process */
-        request_t *request;	/* Parameters passed to clientReadBody */
+        HttpRequest *request;	/* Parameters passed to clientReadBody */
         char *buf;
         size_t bufsize;
         CBCB *callback;
diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index a0db432870..fc07abcd7e 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.63 2003/08/04 22:14:41 robertc Exp $
+ * $Id: client_side_reply.cc,v 1.64 2003/08/10 11:00:42 robertc Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -59,7 +59,7 @@ CBDATA_CLASS_INIT(clientReplyContext);
 extern "C" CSS clientReplyStatus;
 extern ErrorState *clientBuildError(err_type, http_status, char const *,
 
-                                        struct in_addr *, request_t *);
+                                        struct in_addr *, HttpRequest *);
 
 /* privates */
 
@@ -88,7 +88,7 @@ void
 clientReplyContext::setReplyToError(
     err_type err, http_status status, method_t method, char const *uri,
 
-    struct in_addr *addr, request_t * failedrequest, char *unparsedrequest,
+    struct in_addr *addr, HttpRequest * failedrequest, char *unparsedrequest,
     auth_user_request_t * auth_user_request)
 {
     ErrorState *errstate =
@@ -561,7 +561,7 @@ clientReplyContext::cacheHit(StoreIOBuffer result)
 
     StoreEntry *e = http->storeEntry();
 
-    request_t *r = http->request;
+    HttpRequest *r = http->request;
 
     debug(88, 3) ("clientCacheHit: %s, %ud bytes\n", http->uri, (unsigned int)result.length);
 
@@ -762,7 +762,7 @@ void
 clientReplyContext::processMiss()
 {
     char *url = http->uri;
-    request_t *r = http->request;
+    HttpRequest *r = http->request;
     ErrorState *err = NULL;
     debug(88, 4) ("clientProcessMiss: '%s %s'\n",
                   RequestMethodStr[r->method], url);
@@ -1284,7 +1284,7 @@ clientReplyContext::buildReplyHeader()
 {
     HttpHeader *hdr = &holdingReply->header;
     int is_hit = logTypeIsATcpHit(http->logType);
-    request_t *request = http->request;
+    HttpRequest *request = http->request;
 #if DONT_FILTER_THESE
     /* but you might want to if you run Squid as an HTTP accelerator */
     /* httpHeaderDelById(hdr, HDR_ACCEPT_RANGES); */
@@ -1465,7 +1465,7 @@ clientReplyContext::buildReply(const char *buf, size_t size)
 void
 clientReplyContext::identifyStoreObject()
 {
-    request_t *r = http->request;
+    HttpRequest *r = http->request;
 
     if (r->flags.cachable || r->flags.internal) {
         lookingforstore = 5;
@@ -1478,7 +1478,7 @@ void
 clientReplyContext::identifyFoundObject(StoreEntry *newEntry)
 {
     StoreEntry *e = newEntry;
-    request_t *r = http->request;
+    HttpRequest *r = http->request;
 
     if (e->isNull()) {
         http->storeEntry(NULL);
@@ -2127,7 +2127,7 @@ clientReplyContext::createStoreEntry(method_t m, request_flags flags)
 ErrorState *
 clientBuildError(err_type page_id, http_status status, char const *url,
 
-                 struct in_addr * src_addr, request_t * request)
+                 struct in_addr * src_addr, HttpRequest * request)
 {
     ErrorState *err = errorCon(page_id, status);
     err->src_addr = *src_addr;
diff --git a/src/client_side_reply.h b/src/client_side_reply.h
index f6e4b32708..fcde7524e1 100644
--- a/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.h,v 1.5 2003/08/04 22:14:41 robertc Exp $
+ * $Id: client_side_reply.h,v 1.6 2003/08/10 11:00:42 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -73,7 +73,7 @@ public:
     int storeOKTransferDone() const;
     int storeNotOKTransferDone() const;
 
-    void setReplyToError(err_type, http_status, method_t, char const *, struct in_addr *, request_t *, char *, auth_user_request_t *);
+    void setReplyToError(err_type, http_status, method_t, char const *, struct in_addr *, HttpRequest *, char *, auth_user_request_t *);
     void createStoreEntry(method_t m, request_flags flags);
     void removeStoreReference(store_client ** scp, StoreEntry ** ep);
     void removeClientStoreReference(store_client **scp, ClientHttpRequest *http);
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 506a55dbff..bfa580af5c 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.30 2003/08/04 22:14:41 robertc Exp $
+ * $Id: client_side_request.cc,v 1.31 2003/08/10 11:00:42 robertc Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -277,7 +277,7 @@ clientBeginRequest(method_t method, char const *url, CSCB * streamcallback,
     http_version_t http_ver =
         {1, 0};
     clientHttpRequest *http = new ClientHttpRequest;
-    request_t *request;
+    HttpRequest *request;
     StoreIOBuffer tempBuffer;
     http->http_ver = http_ver;
     http->setConn(NULL);
@@ -445,7 +445,7 @@ clientAccessCheckDone(int answer, void *data)
 static int
 clientCachable(clientHttpRequest * http)
 {
-    request_t *req = http->request;
+    HttpRequest *req = http->request;
     method_t method = req->method;
 
     if (req->protocol == PROTO_HTTP)
@@ -487,7 +487,7 @@ static int
 clientHierarchical(clientHttpRequest * http)
 {
     const char *url = http->uri;
-    request_t *request = http->request;
+    HttpRequest *request = http->request;
     method_t method = request->method;
     const wordlist *p = NULL;
 
@@ -539,7 +539,7 @@ clientHierarchical(clientHttpRequest * http)
 static void
 clientInterpretRequestHeaders(clientHttpRequest * http)
 {
-    request_t *request = http->request;
+    HttpRequest *request = http->request;
     const HttpHeader *req_hdr = &request->header;
     int no_cache = 0;
 #if !(ESI) || defined(USE_USERAGENT_LOG) || defined(USE_REFERER_LOG)
@@ -711,8 +711,8 @@ clientRedirectDone(void *data, char *result)
     }
 
     clientHttpRequest *http = context->http;
-    request_t *new_request = NULL;
-    request_t *old_request = http->request;
+    HttpRequest *new_request = NULL;
+    HttpRequest *old_request = http->request;
     debug(85, 5) ("clientRedirectDone: '%s' result=%s\n", http->uri,
                   result ? result : "NULL");
     assert(context->redirect_state == REDIRECT_PENDING);
diff --git a/src/client_side_request.h b/src/client_side_request.h
index 8f8dde0ca4..3fd1981b37 100644
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.h,v 1.16 2003/08/04 22:14:41 robertc Exp $
+ * $Id: client_side_request.h,v 1.17 2003/08/10 11:00:42 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -76,7 +76,7 @@ public:
     _SQUID_INLINE_ ConnStateData::Pointer getConn();
     _SQUID_INLINE_ ConnStateData::Pointer const getConn() const;
     _SQUID_INLINE_ void setConn(ConnStateData::Pointer);
-    request_t *request;		/* Parsed URL ... */
+    HttpRequest *request;		/* Parsed URL ... */
     char *uri;
     char *log_uri;
 
diff --git a/src/errorpage.cc b/src/errorpage.cc
index 9ad5c749ed..fe84e8a906 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: errorpage.cc,v 1.189 2003/07/09 14:14:58 hno Exp $
+ * $Id: errorpage.cc,v 1.190 2003/08/10 11:00:42 robertc Exp $
  *
  * DEBUG: section 4     Error Generation
  * AUTHOR: Duane Wessels
@@ -275,9 +275,9 @@ errorPageId(const char *page_name)
             return i;
     }
 
-    for (size_t i = 0; i < ErrorDynamicPages.size(); i++) {
-        if (strcmp(ErrorDynamicPages.items[i]->page_name, page_name) == 0)
-            return i + ERR_MAX;
+    for (size_t j = 0; j < ErrorDynamicPages.size(); j++) {
+        if (strcmp(ErrorDynamicPages.items[j]->page_name, page_name) == 0)
+            return j + ERR_MAX;
     }
 
     return ERR_NONE;
@@ -483,7 +483,7 @@ errorStateFree(ErrorState * err)
 static int
 errorDump(ErrorState * err, MemBuf * mb)
 {
-    request_t *r = err->request;
+    HttpRequest *r = err->request;
     MemBuf str = MemBufNULL;
     const char *p = NULL;	/* takes priority over mb if set */
     memBufReset(&str);
@@ -592,7 +592,7 @@ errorDump(ErrorState * err, MemBuf * mb)
 static const char *
 errorConvert(char token, ErrorState * err)
 {
-    request_t *r = err->request;
+    HttpRequest *r = err->request;
     static MemBuf mb = MemBufNULL;
     const char *p = NULL;	/* takes priority over mb if set */
     int do_quote = 1;
diff --git a/src/external_acl.cc b/src/external_acl.cc
index aa2dab360a..94d40e1966 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.52 2003/08/04 22:14:42 robertc Exp $
+ * $Id: external_acl.cc,v 1.53 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -681,7 +681,7 @@ makeExternalAclKey(ACLChecklist * ch, external_acl_data * acl_data)
     int first = 1;
     wordlist *arg;
     external_acl_format *format;
-    request_t *request = ch->request;
+    HttpRequest *request = ch->request;
     memBufReset(&mb);
 
     for (format = acl_data->def->format; format; format = format->next) {
diff --git a/src/forward.cc b/src/forward.cc
index 8ec1a882b7..288de2e9fe 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.108 2003/08/10 05:11:22 robertc Exp $
+ * $Id: forward.cc,v 1.109 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -267,7 +267,7 @@ fwdNegotiateSSL(int fd, void *data)
     SSL *ssl = fd_table[fd].ssl;
     int ret;
     ErrorState *err;
-    request_t *request = fwdState->request;
+    HttpRequest *request = fwdState->request;
 
     if ((ret = SSL_connect(ssl)) <= 0) {
         int ssl_error = SSL_get_error(ssl, ret);
@@ -380,7 +380,7 @@ fwdConnectDone(int server_fd, comm_err_t status, int xerrno, void *data)
     FwdState *fwdState = (FwdState *)data;
     FwdServer *fs = fwdState->servers;
     ErrorState *err;
-    request_t *request = fwdState->request;
+    HttpRequest *request = fwdState->request;
     assert(fwdState->server_fd == server_fd);
 
     if (status == COMM_ERR_DNS) {
@@ -510,7 +510,7 @@ aclMapTOS(acl_tos * head, ACLChecklist * ch)
 }
 
 struct in_addr
-            getOutgoingAddr(request_t * request)
+            getOutgoingAddr(HttpRequest * request)
 {
     ACLChecklist ch;
 
@@ -526,7 +526,7 @@ struct in_addr
 }
 
 unsigned long
-getOutgoingTOS(request_t * request)
+getOutgoingTOS(HttpRequest * request)
 {
     ACLChecklist ch;
 
@@ -668,7 +668,7 @@ static void
 fwdDispatch(FwdState * fwdState)
 {
     peer *p = NULL;
-    request_t *request = fwdState->request;
+    HttpRequest *request = fwdState->request;
     StoreEntry *entry = fwdState->entry;
     ErrorState *err;
     FwdServer *fs = fwdState->servers;
@@ -833,7 +833,7 @@ fwdServersFree(FwdServer ** FS)
 }
 
 void
-fwdStart(int fd, StoreEntry * e, request_t * r)
+fwdStart(int fd, StoreEntry * e, HttpRequest * r)
 {
     FwdState *fwdState;
     int answer;
diff --git a/src/ftp.cc b/src/ftp.cc
index 9305bec733..2965ae73b2 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.352 2003/08/07 13:16:30 robertc Exp $
+ * $Id: ftp.cc,v 1.353 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -138,7 +138,7 @@ public:
     void operator delete (void *);
     ~FtpStateData();
     StoreEntry *entry;
-    request_t *request;
+    HttpRequest *request;
     char user[MAX_URL];
     char password[MAX_URL];
     int password_url;
@@ -244,7 +244,7 @@ static void ftpLoginParser(const char *, FtpStateData *, int escaped);
 static wordlist *ftpParseControlReply(char *, size_t, int *, int *);
 static int ftpRestartable(FtpStateData * ftpState);
 static void ftpAppendSuccessHeader(FtpStateData * ftpState);
-static void ftpAuthRequired(HttpReply * reply, request_t * request, const char *realm);
+static void ftpAuthRequired(HttpReply * reply, HttpRequest * request, const char *realm);
 static void ftpHackShortcut(FtpStateData * ftpState, FTPSM * nextState);
 static void ftpUnhack(FtpStateData * ftpState);
 static void ftpScheduleReadControlReply(FtpStateData *, int);
@@ -1267,7 +1267,7 @@ ftpCheckAuth(FtpStateData * ftpState, const HttpHeader * req_hdr)
 static void
 ftpCheckUrlpath(FtpStateData * ftpState)
 {
-    request_t *request = ftpState->request;
+    HttpRequest *request = ftpState->request;
     int l;
     const char *t;
 
@@ -1303,7 +1303,7 @@ ftpCheckUrlpath(FtpStateData * ftpState)
 static void
 ftpBuildTitleUrl(FtpStateData * ftpState)
 {
-    request_t *request = ftpState->request;
+    HttpRequest *request = ftpState->request;
 
     ftpState->title_url = "ftp://";
 
@@ -1348,7 +1348,7 @@ ftpBuildTitleUrl(FtpStateData * ftpState)
 void
 ftpStart(FwdState * fwd)
 {
-    request_t *request = fwd->request;
+    HttpRequest *request = fwd->request;
     StoreEntry *entry = fwd->entry;
     int fd = fwd->server_fd;
     LOCAL_ARRAY(char, realm, 8192);
@@ -3125,7 +3125,7 @@ ftpAppendSuccessHeader(FtpStateData * ftpState)
 }
 
 static void
-ftpAuthRequired(HttpReply * old_reply, request_t * request, const char *realm)
+ftpAuthRequired(HttpReply * old_reply, HttpRequest * request, const char *realm)
 {
     ErrorState *err = errorCon(ERR_CACHE_ACCESS_DENIED, HTTP_UNAUTHORIZED);
     HttpReply *rep;
@@ -3139,7 +3139,7 @@ ftpAuthRequired(HttpReply * old_reply, request_t * request, const char *realm)
 }
 
 char *
-ftpUrlWith2f(const request_t * request)
+ftpUrlWith2f(const HttpRequest * request)
 {
     LOCAL_ARRAY(char, buf, MAX_URL);
     LOCAL_ARRAY(char, loginbuf, MAX_LOGIN_SZ + 1);
diff --git a/src/gopher.cc b/src/gopher.cc
index f7dbbf2cf6..3620fb5fdf 100644
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: gopher.cc,v 1.183 2003/06/20 01:01:00 robertc Exp $
+ * $Id: gopher.cc,v 1.184 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
@@ -92,7 +92,7 @@ typedef struct gopher_ds
     int len;
     char *buf;			/* pts to a 4k page */
     int fd;
-    request_t *req;
+    HttpRequest *req;
     FwdState *fwdState;
     char replybuf[BUFSIZ];
 }
@@ -102,7 +102,7 @@ GopherStateData;
 static PF gopherStateFree;
 static void gopher_mime_content(MemBuf * mb, const char *name, const char *def);
 static void gopherMimeCreate(GopherStateData *);
-static void gopher_request_parse(const request_t * req,
+static void gopher_request_parse(const HttpRequest * req,
                                  char *type_id,
                                  char *request);
 static void gopherEndHTML(GopherStateData *);
@@ -225,7 +225,7 @@ gopherMimeCreate(GopherStateData * gopherState)
 
 /* Parse a gopher request into components.  By Anawat. */
 static void
-gopher_request_parse(const request_t * req, char *type_id, char *request)
+gopher_request_parse(const HttpRequest * req, char *type_id, char *request)
 {
     const char *path = req->urlpath.buf();
 
@@ -250,7 +250,7 @@ gopher_request_parse(const request_t * req, char *type_id, char *request)
 }
 
 int
-gopherCachable(const request_t * req)
+gopherCachable(const HttpRequest * req)
 {
     int cachable = 1;
     char type_id;
diff --git a/src/htcp.cc b/src/htcp.cc
index 67f22310af..99bc6be0df 100644
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: htcp.cc,v 1.55 2003/07/17 22:22:53 wessels Exp $
+ * $Id: htcp.cc,v 1.56 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 31    Hypertext Caching Protocol
  * AUTHOR: Duane Wesssels
@@ -142,7 +142,7 @@ public:
 
 private:
     static MemPool *pool;
-    request_t *checkHitRequest;
+    HttpRequest *checkHitRequest;
 
     struct sockaddr_in *from;
     htcpDataHeader *dhdr;
@@ -1201,7 +1201,7 @@ htcpInit(void)
 }
 
 void
-htcpQuery(StoreEntry * e, request_t * req, peer * p)
+htcpQuery(StoreEntry * e, HttpRequest * req, peer * p)
 {
     cache_key *save_key;
     char *pkt;
diff --git a/src/htcp.h b/src/htcp.h
index 4abe81ceca..5f3791462c 100644
--- a/src/htcp.h
+++ b/src/htcp.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: htcp.h,v 1.4 2003/07/15 06:50:42 robertc Exp $
+ * $Id: htcp.h,v 1.5 2003/08/10 11:00:43 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -62,7 +62,7 @@ typedef class HtcpReplyData htcpReplyData;
 
 SQUIDCEXTERN void neighborsHtcpReply(const cache_key *, htcpReplyData *, const struct sockaddr_in *);
 SQUIDCEXTERN void htcpInit(void);
-SQUIDCEXTERN void htcpQuery(StoreEntry * e, request_t * req, peer * p);
+SQUIDCEXTERN void htcpQuery(StoreEntry * e, HttpRequest * req, peer * p);
 SQUIDCEXTERN void htcpSocketShutdown(void);
 SQUIDCEXTERN void htcpSocketClose(void);
 
diff --git a/src/http.cc b/src/http.cc
index aff8ca7b15..3d0b2467ff 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.425 2003/08/04 22:14:42 robertc Exp $
+ * $Id: http.cc,v 1.426 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -66,9 +66,9 @@ static void httpCacheNegatively(StoreEntry *);
 static void httpMakePrivate(StoreEntry *);
 static void httpMakePublic(StoreEntry *);
 static void httpMaybeRemovePublic(StoreEntry *, http_status);
-static void copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, String strConnection, request_t * request, request_t * orig_request,
+static void copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, String strConnection, HttpRequest * request, HttpRequest * orig_request,
         HttpHeader * hdr_out, int we_do_ranges, http_state_flags);
-static int decideIfWeDoRanges (request_t * orig_request);
+static int decideIfWeDoRanges (HttpRequest * orig_request);
 
 
 static void
@@ -516,7 +516,7 @@ HttpStateData::cacheableReply()
  * Returns false if the variance cannot be stored
  */
 const char *
-httpMakeVaryMark(request_t * request, HttpReply const * reply)
+httpMakeVaryMark(HttpRequest * request, HttpReply const * reply)
 {
     String vary, hdr;
     const char *pos = NULL;
@@ -898,7 +898,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
         } else if (entry->isEmpty()) {
             ErrorState *err;
             err = errorCon(ERR_READ_ERROR, HTTP_INTERNAL_SERVER_ERROR);
-            err->request = requestLink((request_t *) request);
+            err->request = requestLink((HttpRequest *) request);
             err->xerrno = errno;
             fwdFail(fwd, err);
             do_next_read = 0;
@@ -911,7 +911,7 @@ HttpStateData::readReply (int fd, char *readBuf, size_t len, comm_err_t flag, in
         ErrorState *err;
         err = errorCon(ERR_ZERO_SIZE_OBJECT, HTTP_SERVICE_UNAVAILABLE);
         err->xerrno = errno;
-        err->request = requestLink((request_t *) request);
+        err->request = requestLink((HttpRequest *) request);
         fwdFail(fwd, err);
         eof = 1;
         do_next_read = 0;
@@ -1112,8 +1112,8 @@ HttpStateData::SendComplete(int fd, char *bufnotused, size_t size, comm_err_t er
  * note: initialised the HttpHeader, the caller is responsible for Clean()-ing
  */
 void
-httpBuildRequestHeader(request_t * request,
-                       request_t * orig_request,
+httpBuildRequestHeader(HttpRequest * request,
+                       HttpRequest * orig_request,
                        StoreEntry * entry,
                        HttpHeader * hdr_out,
                        http_state_flags flags)
@@ -1330,7 +1330,7 @@ httpBuildRequestHeader(request_t * request,
 
 
 void
-copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, String strConnection, request_t * request, request_t * orig_request, HttpHeader * hdr_out, int we_do_ranges, http_state_flags flags)
+copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, String strConnection, HttpRequest * request, HttpRequest * orig_request, HttpHeader * hdr_out, int we_do_ranges, http_state_flags flags)
 {
     debug(11, 5) ("httpBuildRequestHeader: %s: %s\n",
                   e->name.buf(), e->value.buf());
@@ -1457,7 +1457,7 @@ copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeaderEntry *e, St
 }
 
 int
-decideIfWeDoRanges (request_t * orig_request)
+decideIfWeDoRanges (HttpRequest * orig_request)
 {
     int result = 1;
     /* decide if we want to do Ranges ourselves
@@ -1485,8 +1485,8 @@ decideIfWeDoRanges (request_t * orig_request)
 /* build request prefix and append it to a given MemBuf;
  * return the length of the prefix */
 mb_size_t
-httpBuildRequestPrefix(request_t * request,
-                       request_t * orig_request,
+httpBuildRequestPrefix(HttpRequest * request,
+                       HttpRequest * orig_request,
                        StoreEntry * entry,
                        MemBuf * mb,
                        http_state_flags flags)
@@ -1518,7 +1518,7 @@ static void
 httpSendRequest(HttpStateData * httpState)
 {
     MemBuf mb;
-    request_t *req = httpState->request;
+    HttpRequest *req = httpState->request;
     StoreEntry *entry = httpState->entry;
     peer *p = httpState->_peer;
     CWCB *sendHeaderDone;
@@ -1580,8 +1580,8 @@ httpStart(FwdState * fwd)
 {
     int fd = fwd->server_fd;
     HttpStateData *httpState;
-    request_t *proxy_req;
-    request_t *orig_req = fwd->request;
+    HttpRequest *proxy_req;
+    HttpRequest *orig_req = fwd->request;
     debug(11, 3) ("httpStart: \"%s %s\"\n",
                   RequestMethodStr[orig_req->method],
                   storeUrl(fwd->entry));
diff --git a/src/http.h b/src/http.h
index 93ec0bcc81..177c58b00f 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.h,v 1.8 2003/07/14 14:16:00 robertc Exp $
+ * $Id: http.h,v 1.9 2003/08/10 11:00:43 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -49,13 +49,13 @@ public:
     int cacheableReply();
 
     StoreEntry *entry;
-    request_t *request;
+    HttpRequest *request;
     char *reply_hdr;
     size_t reply_hdr_size;
     int reply_hdr_state;
     peer *_peer;		/* peer request made to */
     int eof;			/* reached end-of-object? */
-    request_t *orig_request;
+    HttpRequest *orig_request;
     int fd;
     http_state_flags flags;
     FwdState *fwd;
diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index d3f7ad5f9e..59192b820f 100644
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v2.cc,v 1.81 2003/07/06 21:50:56 hno Exp $
+ * $Id: icp_v2.cc,v 1.82 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -309,7 +309,7 @@ icpUdpSend(int fd,
 }
 
 int
-icpCheckUdpHit(StoreEntry * e, request_t * request)
+icpCheckUdpHit(StoreEntry * e, HttpRequest * request)
 {
     if (e == NULL)
         return 0;
@@ -393,7 +393,7 @@ icpDenyAccess(struct sockaddr_in *from, char *url, int reqnum, int fd)
 
 int
 
-icpAccessAllowed(struct sockaddr_in *from, request_t * icp_request)
+icpAccessAllowed(struct sockaddr_in *from, HttpRequest * icp_request)
 {
     ACLChecklist checklist;
     checklist.src_addr = from->sin_addr;
@@ -411,7 +411,7 @@ icpGetUrlToSend(char *url)
         return url;
 }
 
-request_t *
+HttpRequest *
 
 icpGetRequest(char *url, int reqnum, int fd, struct sockaddr_in * from)
 {
@@ -422,7 +422,7 @@ icpGetRequest(char *url, int reqnum, int fd, struct sockaddr_in * from)
         return NULL;
     }
 
-    request_t *result;
+    HttpRequest *result;
 
     if ((result = urlParse(METHOD_GET, url)) == NULL)
         icpCreateAndSend(ICP_ERR, 0, url, reqnum, 0, fd, from);
@@ -440,7 +440,7 @@ doV2Query(int fd, struct sockaddr_in from, char *buf, icp_common_t header)
     u_int32_t flags = 0;
     /* We have a valid packet */
     char *url = buf + sizeof(icp_common_t) + sizeof(u_int32_t);
-    request_t *icp_request = icpGetRequest(url, header.reqnum, fd, &from);
+    HttpRequest *icp_request = icpGetRequest(url, header.reqnum, fd, &from);
 
     if (!icp_request)
         return;
diff --git a/src/icp_v3.cc b/src/icp_v3.cc
index ee9bb0d46f..66112a0d20 100644
--- a/src/icp_v3.cc
+++ b/src/icp_v3.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v3.cc,v 1.38 2003/02/21 22:50:09 robertc Exp $
+ * $Id: icp_v3.cc,v 1.39 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -54,7 +54,7 @@ doV3Query(int fd, struct sockaddr_in from, char *buf, icp_common_t header)
 {
     /* We have a valid packet */
     char *url = buf + sizeof(icp_common_t) + sizeof(u_int32_t);
-    request_t *icp_request = icpGetRequest (url, header.reqnum, fd, &from);
+    HttpRequest *icp_request = icpGetRequest (url, header.reqnum, fd, &from);
 
     if (!icp_request)
         return;
diff --git a/src/internal.cc b/src/internal.cc
index 3a01ff2b1e..f594c47d1c 100644
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: internal.cc,v 1.28 2003/02/21 22:50:09 robertc Exp $
+ * $Id: internal.cc,v 1.29 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 76    Internal Squid Object handling
  * AUTHOR: Duane, Alex, Henrik
@@ -43,7 +43,7 @@
  * return HTTP_NOT_FOUND for others
  */
 void
-internalStart(request_t * request, StoreEntry * entry)
+internalStart(HttpRequest * request, StoreEntry * entry)
 {
     ErrorState *err;
     const char *upath = request->urlpath.buf();
diff --git a/src/mime.cc b/src/mime.cc
index acee3acd17..dc7ee8c9fc 100644
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mime.cc,v 1.112 2003/04/24 06:35:09 hno Exp $
+ * $Id: mime.cc,v 1.113 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 25    MIME Parsing
  * AUTHOR: Harvest Derived
@@ -597,7 +597,7 @@ MimeIcon::created (StoreEntry *newEntry)
     EBIT_SET(e->flags, ENTRY_SPECIAL);
     storeSetPublicKey(e);
     storeBuffer(e);
-    request_t *r = urlParse(METHOD_GET, url);
+    HttpRequest *r = urlParse(METHOD_GET, url);
 
     if (NULL == r)
         fatal("mimeLoadIcon: cannot parse internal URL");
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 80b42def9d..d971a6a0c0 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.320 2003/07/14 14:16:00 robertc Exp $
+ * $Id: neighbors.cc,v 1.321 2003/08/10 11:00:43 robertc Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -44,8 +44,8 @@
 /* count mcast group peers every 15 minutes */
 #define MCAST_COUNT_RATE 900
 
-static int peerAllowedToUse(const peer *, request_t *);
-static int peerWouldBePinged(const peer *, request_t *);
+static int peerAllowedToUse(const peer *, HttpRequest *);
+static int peerWouldBePinged(const peer *, HttpRequest *);
 static void neighborRemove(peer *);
 static void neighborAlive(peer *, const MemObject *, const icp_common_t *);
 #if USE_HTCP
@@ -113,7 +113,7 @@ whichPeer(const struct sockaddr_in * from)
 }
 
 peer_t
-neighborType(const peer * p, const request_t * request)
+neighborType(const peer * p, const HttpRequest * request)
 {
 
     const struct _domain_type *d = NULL;
@@ -134,7 +134,7 @@ neighborType(const peer * p, const request_t * request)
  * from PEER.
  */
 static int
-peerAllowedToUse(const peer * p, request_t * request)
+peerAllowedToUse(const peer * p, HttpRequest * request)
 {
 
     const struct _domain_ping *d = NULL;
@@ -201,7 +201,7 @@ peerAllowedToUse(const peer * p, request_t * request)
 
 /* Return TRUE if it is okay to send an ICP request to this peer.   */
 static int
-peerWouldBePinged(const peer * p, request_t * request)
+peerWouldBePinged(const peer * p, HttpRequest * request)
 {
     if (!peerAllowedToUse(p, request))
         return 0;
@@ -240,7 +240,7 @@ peerWouldBePinged(const peer * p, request_t * request)
 
 /* Return TRUE if it is okay to send an HTTP request to this peer. */
 int
-peerHTTPOkay(const peer * p, request_t * request)
+peerHTTPOkay(const peer * p, HttpRequest * request)
 {
     if (!peerAllowedToUse(p, request))
         return 0;
@@ -256,7 +256,7 @@ peerHTTPOkay(const peer * p, request_t * request)
 }
 
 int
-neighborsCount(request_t * request)
+neighborsCount(HttpRequest * request)
 {
     peer *p = NULL;
     int count = 0;
@@ -272,7 +272,7 @@ neighborsCount(request_t * request)
 
 #if UNUSED_CODE
 peer *
-getSingleParent(request_t * request)
+getSingleParent(HttpRequest * request)
 {
     peer *p = NULL;
     peer *q = NULL;
@@ -301,7 +301,7 @@ getSingleParent(request_t * request)
 #endif
 
 peer *
-getFirstUpParent(request_t * request)
+getFirstUpParent(HttpRequest * request)
 {
     peer *p = NULL;
 
@@ -323,7 +323,7 @@ getFirstUpParent(request_t * request)
 }
 
 peer *
-getRoundRobinParent(request_t * request)
+getRoundRobinParent(HttpRequest * request)
 {
     peer *p;
     peer *q = NULL;
@@ -353,7 +353,7 @@ getRoundRobinParent(request_t * request)
 }
 
 peer *
-getWeightedRoundRobinParent(request_t * request)
+getWeightedRoundRobinParent(HttpRequest * request)
 {
     peer *p;
     peer *q = NULL;
@@ -417,7 +417,7 @@ peerClearRR(void *data)
 }
 
 peer *
-getDefaultParent(request_t * request)
+getDefaultParent(HttpRequest * request)
 {
     peer *p = NULL;
 
@@ -447,7 +447,7 @@ getDefaultParent(request_t * request)
  * DOWN parent.
  */
 peer *
-getAnyParent(request_t * request)
+getAnyParent(HttpRequest * request)
 {
     peer *p = NULL;
 
@@ -575,7 +575,7 @@ neighbors_init(void)
 }
 
 int
-neighborsUdpPing(request_t * request,
+neighborsUdpPing(HttpRequest * request,
                  StoreEntry * entry,
                  IRCB * callback,
                  void *callback_data,
@@ -771,7 +771,7 @@ neighborsUdpPing(request_t * request,
 
 /* lookup the digest of a given peer */
 lookup_t
-peerDigestLookup(peer * p, request_t * request)
+peerDigestLookup(peer * p, HttpRequest * request)
 {
 #if USE_CACHE_DIGESTS
     const cache_key *key = request ? storeKeyPublicByRequest(request) : NULL;
@@ -818,7 +818,7 @@ peerDigestLookup(peer * p, request_t * request)
 
 /* select best peer based on cache digests */
 peer *
-neighborsDigestSelect(request_t * request)
+neighborsDigestSelect(HttpRequest * request)
 {
     peer *best_p = NULL;
 #if USE_CACHE_DIGESTS
@@ -885,7 +885,7 @@ neighborsDigestSelect(request_t * request)
 }
 
 void
-peerNoteDigestLookup(request_t * request, peer * p, lookup_t lookup)
+peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup)
 {
 #if USE_CACHE_DIGESTS
 
diff --git a/src/net_db.cc b/src/net_db.cc
index 226cf99017..42492a029b 100644
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.171 2003/04/20 05:28:59 robertc Exp $
+ * $Id: net_db.cc,v 1.172 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -65,7 +65,7 @@ typedef struct
     peer *p;
     StoreEntry *e;
     store_client *sc;
-    request_t *r;
+    HttpRequest *r;
     off_t used;
     size_t buf_sz;
     char buf[NETDB_REQBUF_SZ];
@@ -1095,7 +1095,7 @@ netdbHostData(const char *host, int *samp, int *rtt, int *hops)
 }
 
 void
-netdbUpdatePeer(request_t * r, peer * e, int irtt, int ihops)
+netdbUpdatePeer(HttpRequest * r, peer * e, int irtt, int ihops)
 {
 #if USE_ICMP
     netdbEntry *n;
@@ -1317,7 +1317,7 @@ netdbExchangeStart(void *data)
 }
 
 peer *
-netdbClosestParent(request_t * request)
+netdbClosestParent(HttpRequest * request)
 {
 #if USE_ICMP
     peer *p = NULL;
diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 6fa69c5f2f..af69eccbc3 100644
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.cc,v 1.98 2003/08/04 22:14:42 robertc Exp $
+ * $Id: peer_digest.cc,v 1.99 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -297,7 +297,7 @@ peerDigestRequest(PeerDigest * pd)
     StoreEntry *e, *old_e;
     char *url;
     const cache_key *key;
-    request_t *req;
+    HttpRequest *req;
     DigestFetchState *fetch = NULL;
     StoreIOBuffer tempBuffer;
 
@@ -534,7 +534,7 @@ peerDigestFetchReply(void *data, char *buf, ssize_t size)
         /* this "if" is based on clientHandleIMSReply() */
 
         if (status == HTTP_NOT_MODIFIED) {
-            request_t *r = NULL;
+            HttpRequest *r = NULL;
             /* our old entry is fine */
             assert(fetch->old_entry);
 
diff --git a/src/peer_select.cc b/src/peer_select.cc
index 9fbdbd99ab..e857a00e31 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_select.cc,v 1.130 2003/07/14 14:16:00 robertc Exp $
+ * $Id: peer_select.cc,v 1.131 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 44    Peer Selection Algorithm
  * AUTHOR: Duane Wessels
@@ -121,7 +121,7 @@ peerSelectStateFree(ps_state * psstate)
 }
 
 static int
-peerSelectIcpPing(request_t * request, int direct, StoreEntry * entry)
+peerSelectIcpPing(HttpRequest * request, int direct, StoreEntry * entry)
 {
     int n;
     assert(entry);
@@ -145,7 +145,7 @@ peerSelectIcpPing(request_t * request, int direct, StoreEntry * entry)
 
 
 void
-peerSelect(request_t * request,
+peerSelect(HttpRequest * request,
            StoreEntry * entry,
            PSC * callback,
            void *callback_data)
@@ -286,7 +286,7 @@ static void
 peerSelectFoo(ps_state * ps)
 {
     StoreEntry *entry = ps->entry;
-    request_t *request = ps->request;
+    HttpRequest *request = ps->request;
     debug(44, 3) ("peerSelectFoo: '%s %s'\n",
                   RequestMethodStr[request->method],
                   request->host);
@@ -380,7 +380,7 @@ static void
 peerGetSomeNeighbor(ps_state * ps)
 {
     StoreEntry *entry = ps->entry;
-    request_t *request = ps->request;
+    HttpRequest *request = ps->request;
     peer *p;
     hier_code code = HIER_NONE;
     assert(entry->ping_status == PING_NONE);
@@ -444,7 +444,7 @@ peerGetSomeNeighbor(ps_state * ps)
 static void
 peerGetSomeNeighborReplies(ps_state * ps)
 {
-    request_t *request = ps->request;
+    HttpRequest *request = ps->request;
     peer *p = NULL;
     hier_code code = HIER_NONE;
     assert(ps->entry->ping_status == PING_WAITING);
@@ -503,7 +503,7 @@ static void
 peerGetSomeParent(ps_state * ps)
 {
     peer *p;
-    request_t *request = ps->request;
+    HttpRequest *request = ps->request;
     hier_code code = HIER_NONE;
     debug(44, 3) ("peerGetSomeParent: %s %s\n",
                   RequestMethodStr[request->method],
@@ -542,7 +542,7 @@ static void
 peerGetAllParents(ps_state * ps)
 {
     peer *p;
-    request_t *request = ps->request;
+    HttpRequest *request = ps->request;
     /* Add all alive parents */
 
     for (p = Config.peers; p; p = p->next) {
diff --git a/src/protos.h b/src/protos.h
index 46f90655fa..42ed67e2f5 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.489 2003/08/10 09:53:49 robertc Exp $
+ * $Id: protos.h,v 1.490 2003/08/10 11:00:44 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -117,8 +117,8 @@ SQUIDCEXTERN void clientdbFreeMemory(void);
 SQUIDCEXTERN int clientdbEstablished(struct in_addr, int);
 SQUIDCEXTERN void clientOpenListenSockets(void);
 SQUIDCEXTERN void clientHttpConnectionsClose(void);
-SQUIDCEXTERN void clientReadBody(request_t * req, char *buf, size_t size, CBCB * callback, void *data);
-SQUIDCEXTERN int clientAbortBody(request_t * req);
+SQUIDCEXTERN void clientReadBody(HttpRequest * req, char *buf, size_t size, CBCB * callback, void *data);
+SQUIDCEXTERN int clientAbortBody(HttpRequest * req);
 SQUIDCEXTERN void httpRequestFree(void *);
 
 extern void clientAccessCheck(void *);
@@ -283,10 +283,10 @@ SQUIDCEXTERN EVH fqdncache_purgelru;
 SQUIDCEXTERN void fqdncacheAddEntryFromHosts(char *addr, wordlist * hostnames);
 
 SQUIDCEXTERN void ftpStart(FwdState *);
-SQUIDCEXTERN char *ftpUrlWith2f(const request_t *);
+SQUIDCEXTERN char *ftpUrlWith2f(const HttpRequest *);
 
 SQUIDCEXTERN void gopherStart(FwdState *);
-SQUIDCEXTERN int gopherCachable(const request_t *);
+SQUIDCEXTERN int gopherCachable(const HttpRequest *);
 
 
 SQUIDCEXTERN void whoisStart(FwdState *);
@@ -295,17 +295,17 @@ SQUIDCEXTERN void whoisStart(FwdState *);
 SQUIDCEXTERN int httpCachable(method_t);
 SQUIDCEXTERN void httpStart(FwdState *);
 SQUIDCEXTERN void httpParseReplyHeaders(const char *, HttpReply *);
-SQUIDCEXTERN mb_size_t httpBuildRequestPrefix(request_t * request,
-        request_t * orig_request,
+SQUIDCEXTERN mb_size_t httpBuildRequestPrefix(HttpRequest * request,
+        HttpRequest * orig_request,
         StoreEntry * entry,
         MemBuf * mb,
         http_state_flags);
 SQUIDCEXTERN void httpAnonInitModule(void);
 SQUIDCEXTERN int httpAnonHdrAllowed(http_hdr_type hdr_id);
 SQUIDCEXTERN int httpAnonHdrDenied(http_hdr_type hdr_id);
-SQUIDCEXTERN void httpBuildRequestHeader(request_t *, request_t *, StoreEntry *, HttpHeader *, http_state_flags);
+SQUIDCEXTERN void httpBuildRequestHeader(HttpRequest *, HttpRequest *, StoreEntry *, HttpHeader *, http_state_flags);
 SQUIDCEXTERN void httpBuildVersion(http_version_t * version, unsigned int major, unsigned int minor);
-SQUIDCEXTERN const char *httpMakeVaryMark(request_t * request, HttpReply const * reply);
+SQUIDCEXTERN const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply);
 
 /* ETag */
 SQUIDCEXTERN int etagParseInit(ETag * etag, const char *str);
@@ -456,7 +456,7 @@ SQUIDCEXTERN HttpHeaderEntry *httpHeaderEntryClone(const HttpHeaderEntry * e);
 SQUIDCEXTERN void httpHeaderEntryPackInto(const HttpHeaderEntry * e, Packer * p);
 /* store report about current header usage and other stats */
 SQUIDCEXTERN void httpHeaderStoreReport(StoreEntry * e);
-SQUIDCEXTERN void httpHdrMangleList(HttpHeader *, request_t *);
+SQUIDCEXTERN void httpHdrMangleList(HttpHeader *, HttpRequest *);
 
 /* Http Msg (currently in HttpReply.c @?@ ) */
 SQUIDCEXTERN int httpMsgIsPersistent(http_version_t http_ver, const HttpHeader * hdr);
@@ -549,11 +549,11 @@ SQUIDCEXTERN IPH mcastJoinGroups;
 
 
 SQUIDCEXTERN peer *getFirstPeer(void);
-SQUIDCEXTERN peer *getFirstUpParent(request_t *);
+SQUIDCEXTERN peer *getFirstUpParent(HttpRequest *);
 SQUIDCEXTERN peer *getNextPeer(peer *);
-SQUIDCEXTERN peer *getSingleParent(request_t *);
-SQUIDCEXTERN int neighborsCount(request_t *);
-SQUIDCEXTERN int neighborsUdpPing(request_t *,
+SQUIDCEXTERN peer *getSingleParent(HttpRequest *);
+SQUIDCEXTERN int neighborsCount(HttpRequest *);
+SQUIDCEXTERN int neighborsUdpPing(HttpRequest *,
                                   StoreEntry *,
                                   IRCB * callback,
                                   void *data,
@@ -566,23 +566,23 @@ SQUIDCEXTERN void neighborAdd(const char *, const char *, int, int, int, int, in
 SQUIDCEXTERN void neighbors_init(void);
 SQUIDCEXTERN peer *peerFindByName(const char *);
 SQUIDCEXTERN peer *peerFindByNameAndPort(const char *, unsigned short);
-SQUIDCEXTERN peer *getDefaultParent(request_t * request);
-SQUIDCEXTERN peer *getRoundRobinParent(request_t * request);
-SQUIDCEXTERN peer *getWeightedRoundRobinParent(request_t * request);
+SQUIDCEXTERN peer *getDefaultParent(HttpRequest * request);
+SQUIDCEXTERN peer *getRoundRobinParent(HttpRequest * request);
+SQUIDCEXTERN peer *getWeightedRoundRobinParent(HttpRequest * request);
 SQUIDCEXTERN EVH peerClearRR;
-SQUIDCEXTERN peer *getAnyParent(request_t * request);
-SQUIDCEXTERN lookup_t peerDigestLookup(peer * p, request_t * request);
-SQUIDCEXTERN peer *neighborsDigestSelect(request_t * request);
-SQUIDCEXTERN void peerNoteDigestLookup(request_t * request, peer * p, lookup_t lookup);
+SQUIDCEXTERN peer *getAnyParent(HttpRequest * request);
+SQUIDCEXTERN lookup_t peerDigestLookup(peer * p, HttpRequest * request);
+SQUIDCEXTERN peer *neighborsDigestSelect(HttpRequest * request);
+SQUIDCEXTERN void peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup);
 SQUIDCEXTERN void peerNoteDigestGone(peer * p);
 SQUIDCEXTERN int neighborUp(const peer * e);
 SQUIDCEXTERN CBDUNL peerDestroy;
 SQUIDCEXTERN const char *neighborTypeStr(const peer * e);
-SQUIDCEXTERN peer_t neighborType(const peer *, const request_t *);
+SQUIDCEXTERN peer_t neighborType(const peer *, const HttpRequest *);
 SQUIDCEXTERN void peerConnectFailed(peer *);
 SQUIDCEXTERN void peerConnectSucceded(peer *);
 SQUIDCEXTERN void dump_peer_options(StoreEntry *, peer *);
-SQUIDCEXTERN int peerHTTPOkay(const peer *, request_t *);
+SQUIDCEXTERN int peerHTTPOkay(const peer *, HttpRequest *);
 
 SQUIDCEXTERN peer *whichPeer(const struct sockaddr_in *from);
 
@@ -596,21 +596,21 @@ SQUIDCEXTERN int netdbHops(struct in_addr);
 SQUIDCEXTERN void netdbFreeMemory(void);
 SQUIDCEXTERN int netdbHostHops(const char *host);
 SQUIDCEXTERN int netdbHostRtt(const char *host);
-SQUIDCEXTERN void netdbUpdatePeer(request_t *, peer * e, int rtt, int hops);
+SQUIDCEXTERN void netdbUpdatePeer(HttpRequest *, peer * e, int rtt, int hops);
 
 SQUIDCEXTERN void netdbDeleteAddrNetwork(struct in_addr addr);
 SQUIDCEXTERN void netdbBinaryExchange(StoreEntry *);
 SQUIDCEXTERN EVH netdbExchangeStart;
 
 SQUIDCEXTERN void netdbExchangeUpdatePeer(struct in_addr, peer *, double, double);
-SQUIDCEXTERN peer *netdbClosestParent(request_t *);
+SQUIDCEXTERN peer *netdbClosestParent(HttpRequest *);
 SQUIDCEXTERN void netdbHostData(const char *host, int *samp, int *rtt, int *hops);
 
-SQUIDCEXTERN void cachemgrStart(int fd, request_t * request, StoreEntry * entry);
+SQUIDCEXTERN void cachemgrStart(int fd, HttpRequest * request, StoreEntry * entry);
 SQUIDCEXTERN void cachemgrRegister(const char *, const char *, OBJH *, int, int);
 SQUIDCEXTERN void cachemgrInit(void);
 
-SQUIDCEXTERN void peerSelect(request_t *, StoreEntry *, PSC *, void *data);
+SQUIDCEXTERN void peerSelect(HttpRequest *, StoreEntry *, PSC *, void *data);
 SQUIDCEXTERN void peerSelectInit(void);
 
 /* peer_digest.c */
@@ -620,7 +620,7 @@ SQUIDCEXTERN void peerDigestNotePeerGone(PeerDigest * pd);
 SQUIDCEXTERN void peerDigestStatsReport(const PeerDigest * pd, StoreEntry * e);
 
 /* forward.c */
-SQUIDCEXTERN void fwdStart(int, StoreEntry *, request_t *);
+SQUIDCEXTERN void fwdStart(int, StoreEntry *, HttpRequest *);
 SQUIDCEXTERN void fwdFail(FwdState *, ErrorState *);
 SQUIDCEXTERN void fwdUnregister(int fd, FwdState *);
 SQUIDCEXTERN void fwdComplete(FwdState * fwdState);
@@ -633,19 +633,19 @@ SQUIDCEXTERN void fwdLogRotate(void);
 SQUIDCEXTERN void fwdStatus(FwdState *, http_status);
 #endif
 
-SQUIDCEXTERN struct in_addr getOutgoingAddr(request_t * request);
-unsigned long getOutgoingTOS(request_t * request);
+SQUIDCEXTERN struct in_addr getOutgoingAddr(HttpRequest * request);
+unsigned long getOutgoingTOS(HttpRequest * request);
 
-SQUIDCEXTERN void urnStart(request_t *, StoreEntry *);
+SQUIDCEXTERN void urnStart(HttpRequest *, StoreEntry *);
 
 SQUIDCEXTERN void redirectInit(void);
 SQUIDCEXTERN void redirectShutdown(void);
 
 extern void refreshAddToList(const char *, int, time_t, int, time_t);
 extern int refreshIsCachable(const StoreEntry *);
-extern int refreshCheckHTTP(const StoreEntry *, request_t *);
-extern int refreshCheckICP(const StoreEntry *, request_t *);
-extern int refreshCheckHTCP(const StoreEntry *, request_t *);
+extern int refreshCheckHTTP(const StoreEntry *, HttpRequest *);
+extern int refreshCheckICP(const StoreEntry *, HttpRequest *);
+extern int refreshCheckHTCP(const StoreEntry *, HttpRequest *);
 extern int refreshCheckDigest(const StoreEntry *, time_t delta);
 extern time_t getMaxAge(const char *url);
 extern void refreshInit(void);
@@ -761,8 +761,8 @@ SQUIDCEXTERN void storeKeyFree(const cache_key *);
 SQUIDCEXTERN const cache_key *storeKeyScan(const char *);
 SQUIDCEXTERN const char *storeKeyText(const cache_key *);
 SQUIDCEXTERN const cache_key *storeKeyPublic(const char *, const method_t);
-SQUIDCEXTERN const cache_key *storeKeyPublicByRequest(request_t *);
-SQUIDCEXTERN const cache_key *storeKeyPublicByRequestMethod(request_t *, const method_t);
+SQUIDCEXTERN const cache_key *storeKeyPublicByRequest(HttpRequest *);
+SQUIDCEXTERN const cache_key *storeKeyPublicByRequestMethod(HttpRequest *, const method_t);
 SQUIDCEXTERN const cache_key *storeKeyPrivate(const char *, method_t, int);
 SQUIDCEXTERN int storeKeyHashBuckets(int);
 SQUIDCEXTERN int storeKeyNull(const cache_key *);
@@ -893,14 +893,14 @@ SQUIDCEXTERN char *url_escape(const char *url);
 SQUIDCEXTERN protocol_t urlParseProtocol(const char *);
 SQUIDCEXTERN method_t urlParseMethod(const char *);
 SQUIDCEXTERN void urlInitialize(void);
-SQUIDCEXTERN request_t *urlParse(method_t, char *);
-SQUIDCEXTERN const char *urlCanonical(request_t *);
+SQUIDCEXTERN HttpRequest *urlParse(method_t, char *);
+SQUIDCEXTERN const char *urlCanonical(HttpRequest *);
 SQUIDCEXTERN char *urlRInternal(const char *host, u_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 request_t *);
+SQUIDCEXTERN int urlCheckRequest(const HttpRequest *);
 SQUIDCEXTERN int urlDefaultPort(protocol_t p);
-SQUIDCEXTERN char *urlCanonicalClean(const request_t *);
+SQUIDCEXTERN char *urlCanonicalClean(const HttpRequest *);
 SQUIDCEXTERN char *urlHostname(const char *url);
 SQUIDCEXTERN void urlExtMethodConfigure(void);
 
@@ -975,7 +975,7 @@ SQUIDCEXTERN void cacheDigestGuessStatsUpdate(cd_guess_stats * stats, int real_h
 SQUIDCEXTERN void cacheDigestGuessStatsReport(const cd_guess_stats * stats, StoreEntry * sentry, const char *label);
 SQUIDCEXTERN void cacheDigestReport(CacheDigest * cd, const char *label, StoreEntry * e);
 
-SQUIDCEXTERN void internalStart(request_t *, StoreEntry *);
+SQUIDCEXTERN void internalStart(HttpRequest *, StoreEntry *);
 SQUIDCEXTERN int internalCheck(const char *urlpath);
 SQUIDCEXTERN int internalStaticCheck(const char *urlpath);
 SQUIDCEXTERN char *internalLocalUri(const char *dir, const char *name);
@@ -985,7 +985,7 @@ SQUIDCEXTERN int internalHostnameIs(const char *);
 
 #if USE_CARP
 SQUIDCEXTERN void carpInit(void);
-SQUIDCEXTERN peer *carpSelectParent(request_t *);
+SQUIDCEXTERN peer *carpSelectParent(HttpRequest *);
 #endif
 
 /* helper.c */
@@ -1050,7 +1050,7 @@ SQUIDCEXTERN int gethostname(char *, int);
 SQUIDCEXTERN StatCounters *snmpStatGet(int);
 
 /* Vary support functions */
-SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, request_t * req);
+SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req);
 
 /* CygWin & Windows NT Port */
 /* win32.c */
diff --git a/src/refresh.cc b/src/refresh.cc
index e32e779f68..5f143eebd3 100644
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: refresh.cc,v 1.62 2003/07/14 14:16:02 robertc Exp $
+ * $Id: refresh.cc,v 1.63 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 22    Refresh Calculation
  * AUTHOR: Harvest Derived
@@ -237,7 +237,7 @@ refreshStaleness(const StoreEntry * entry, time_t check_time, time_t age, const
  *  note: request maybe null (e.g. for cache digests build)
  */
 static int
-refreshCheck(const StoreEntry * entry, request_t * request, time_t delta)
+refreshCheck(const StoreEntry * entry, HttpRequest * request, time_t delta)
 {
     const refresh_t *R;
     const char *uri = NULL;
@@ -430,7 +430,7 @@ refreshIsCachable(const StoreEntry * entry)
  * refreshCheck() function above */
 
 int
-refreshCheckHTTP(const StoreEntry * entry, request_t * request)
+refreshCheckHTTP(const StoreEntry * entry, HttpRequest * request)
 {
     int reason = refreshCheck(entry, request, 0);
     refreshCounts[rcHTTP].total++;
@@ -439,7 +439,7 @@ refreshCheckHTTP(const StoreEntry * entry, request_t * request)
 }
 
 int
-refreshCheckICP(const StoreEntry * entry, request_t * request)
+refreshCheckICP(const StoreEntry * entry, HttpRequest * request)
 {
     int reason = refreshCheck(entry, request, 30);
     refreshCounts[rcICP].total++;
@@ -449,7 +449,7 @@ refreshCheckICP(const StoreEntry * entry, request_t * request)
 
 #if USE_HTCP
 int
-refreshCheckHTCP(const StoreEntry * entry, request_t * request)
+refreshCheckHTCP(const StoreEntry * entry, HttpRequest * request)
 {
     int reason = refreshCheck(entry, request, 10);
     refreshCounts[rcHTCP].total++;
diff --git a/src/store.cc b/src/store.cc
index 63f75390ef..572d8f493f 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.572 2003/07/22 15:23:02 robertc Exp $
+ * $Id: store.cc,v 1.573 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 20    Storage Manager
  * AUTHOR: Harvest Derived
@@ -489,7 +489,7 @@ storeGet(const cache_key * key)
 }
 
 void
-StoreEntry::getPublicByRequestMethod  (StoreClient *aClient, request_t * request, const method_t method)
+StoreEntry::getPublicByRequestMethod  (StoreClient *aClient, HttpRequest * request, const method_t method)
 {
     assert (aClient);
     StoreEntry *result = storeGetPublicByRequestMethod( request, method);
@@ -501,7 +501,7 @@ StoreEntry::getPublicByRequestMethod  (StoreClient *aClient, request_t * request
 }
 
 void
-StoreEntry::getPublicByRequest (StoreClient *aClient, request_t * request)
+StoreEntry::getPublicByRequest (StoreClient *aClient, HttpRequest * request)
 {
     assert (aClient);
     StoreEntry *result = storeGetPublicByRequest (request);
@@ -531,13 +531,13 @@ storeGetPublic(const char *uri, const method_t method)
 }
 
 StoreEntry *
-storeGetPublicByRequestMethod(request_t * req, const method_t method)
+storeGetPublicByRequestMethod(HttpRequest * req, const method_t method)
 {
     return storeGet(storeKeyPublicByRequestMethod(req, method));
 }
 
 StoreEntry *
-storeGetPublicByRequest(request_t * req)
+storeGetPublicByRequest(HttpRequest * req)
 {
     StoreEntry *e = storeGetPublicByRequestMethod(req, req->method);
 
@@ -621,7 +621,7 @@ storeSetPublicKey(StoreEntry * e)
 
     if (mem->request) {
         StoreEntry *pe;
-        request_t *request = mem->request;
+        HttpRequest *request = mem->request;
 
         if (!mem->vary_headers) {
             /* First handle the case where the object no longer varies */
@@ -1846,7 +1846,7 @@ StoreEntry::trimMemory()
 }
 
 bool
-StoreEntry::modifiedSince(request_t * request) const
+StoreEntry::modifiedSince(HttpRequest * request) const
 {
     int object_length;
     time_t mod_time = lastmod;
diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc
index fc017054cd..c409d3302f 100644
--- a/src/store_key_md5.cc
+++ b/src/store_key_md5.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_key_md5.cc,v 1.30 2003/07/11 01:40:37 robertc Exp $
+ * $Id: store_key_md5.cc,v 1.31 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 20    Storage Manager MD5 Cache Keys
  * AUTHOR: Duane Wessels
@@ -128,13 +128,13 @@ storeKeyPublic(const char *url, const method_t method)
 }
 
 const cache_key *
-storeKeyPublicByRequest(request_t * request)
+storeKeyPublicByRequest(HttpRequest * request)
 {
     return storeKeyPublicByRequestMethod(request, request->method);
 }
 
 const cache_key *
-storeKeyPublicByRequestMethod(request_t * request, const method_t method)
+storeKeyPublicByRequestMethod(HttpRequest * request, const method_t method)
 {
     static cache_key digest[MD5_DIGEST_CHARS];
     unsigned char m = (unsigned char) method;
diff --git a/src/structs.h b/src/structs.h
index 0a82b849dc..d3639d011c 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.477 2003/08/04 22:14:42 robertc Exp $
+ * $Id: structs.h,v 1.478 2003/08/10 11:00:44 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1052,7 +1052,7 @@ struct _AccessLogEntry
     _private;
     HierarchyLogEntry hier;
     HttpReply *reply;
-    request_t *request;
+    HttpRequest *request;
 };
 
 struct _ipcache_addrs
@@ -1109,7 +1109,7 @@ struct _DigestFetchState
     StoreEntry *old_entry;
     store_client *sc;
     store_client *old_sc;
-    request_t *request;
+    HttpRequest *request;
     int offset;
     int mask_offset;
     time_t start_time;
@@ -1420,7 +1420,7 @@ struct _netdbEntry
 
 struct _ps_state
 {
-    request_t *request;
+    HttpRequest *request;
     StoreEntry *entry;
     int always_direct;
     int never_direct;
@@ -1675,7 +1675,7 @@ struct _ErrorState
     int page_id;
     http_status httpStatus;
     auth_user_request_t *auth_user_request;
-    request_t *request;
+    HttpRequest *request;
     char *url;
     int xerrno;
     char *host;
@@ -1975,7 +1975,7 @@ struct _FwdState
 {
     int client_fd;
     StoreEntry *entry;
-    request_t *request;
+    HttpRequest *request;
     FwdServer *servers;
     int server_fd;
     ErrorState *err;
diff --git a/src/tunnel.cc b/src/tunnel.cc
index 95578356ac..fc7d060f36 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.144 2003/08/04 22:14:42 robertc Exp $
+ * $Id: tunnel.cc,v 1.145 2003/08/10 11:00:44 robertc Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -61,7 +61,7 @@ public:
     char *url;
     char *host;			/* either request->host or proxy host */
     u_short port;
-    request_t *request;
+    HttpRequest *request;
     FwdServer *servers;
 
     class Connection
@@ -489,7 +489,7 @@ static void
 sslConnectDone(int fdnotused, comm_err_t status, int xerrno, void *data)
 {
     SslStateData *sslState = (SslStateData *)data;
-    request_t *request = sslState->request;
+    HttpRequest *request = sslState->request;
     ErrorState *err = NULL;
 
     if (sslState->servers->_peer)
@@ -544,7 +544,7 @@ sslStart(clientHttpRequest * http, size_t * size_ptr, int *status_ptr)
     ErrorState *err = NULL;
     int answer;
     int fd = http->getConn()->fd;
-    request_t *request = http->request;
+    HttpRequest *request = http->request;
     char *url = http->uri;
     /*
      * client_addr == no_addr indicates this is an "internal" request
@@ -669,7 +669,7 @@ static void
 sslPeerSelectComplete(FwdServer * fs, void *data)
 {
     SslStateData *sslState = (SslStateData *)data;
-    request_t *request = sslState->request;
+    HttpRequest *request = sslState->request;
     peer *g = NULL;
 
     if (fs == NULL) {
diff --git a/src/url.cc b/src/url.cc
index f44815610e..fc8086e7c2 100644
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.145 2003/06/09 04:41:36 robertc Exp $
+ * $Id: url.cc,v 1.146 2003/08/10 11:00:45 robertc Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -106,7 +106,7 @@ const char *ProtocolStr[] =
         "TOTAL"
     };
 
-static request_t *urnParse(method_t method, char *urn);
+static HttpRequest *urnParse(method_t method, char *urn);
 #if CHECK_HOSTNAMES
 static const char *const valid_hostname_chars =
 #if ALLOW_HOSTNAME_UNDERSCORES
@@ -284,14 +284,14 @@ urlDefaultPort(protocol_t p)
     }
 }
 
-request_t *
+HttpRequest *
 urlParse(method_t method, char *url)
 {
     LOCAL_ARRAY(char, proto, MAX_URL);
     LOCAL_ARRAY(char, login, MAX_URL);
     LOCAL_ARRAY(char, host, MAX_URL);
     LOCAL_ARRAY(char, urlpath, MAX_URL);
-    request_t *request = NULL;
+    HttpRequest *request = NULL;
     char *t = NULL;
     char *q = NULL;
     int port;
@@ -433,7 +433,7 @@ urlParse(method_t method, char *url)
     return request;
 }
 
-static request_t *
+static HttpRequest *
 urnParse(method_t method, char *urn)
 {
     debug(50, 5) ("urnParse: %s\n", urn);
@@ -441,7 +441,7 @@ urnParse(method_t method, char *urn)
 }
 
 const char *
-urlCanonical(request_t * request)
+urlCanonical(HttpRequest * request)
 {
     LOCAL_ARRAY(char, portbuf, 32);
     LOCAL_ARRAY(char, urlbuf, MAX_URL);
@@ -480,7 +480,7 @@ urlCanonical(request_t * request)
 }
 
 char *
-urlCanonicalClean(const request_t * request)
+urlCanonicalClean(const HttpRequest * request)
 {
     LOCAL_ARRAY(char, buf, MAX_URL);
     LOCAL_ARRAY(char, portbuf, 32);
@@ -632,7 +632,7 @@ matchDomainName(const char *h, const char *d)
 }
 
 int
-urlCheckRequest(const request_t * r)
+urlCheckRequest(const HttpRequest * r)
 {
     int rc = 0;
     /* protocol "independent" methods */
diff --git a/src/urn.cc b/src/urn.cc
index abed6cb776..d5f57773d7 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: urn.cc,v 1.84 2003/03/09 12:29:41 robertc Exp $
+ * $Id: urn.cc,v 1.85 2003/08/10 11:00:45 robertc Exp $
  *
  * DEBUG: section 52    URN Parsing
  * AUTHOR: Kostas Anagnostakis
@@ -48,11 +48,11 @@ public:
     void created (StoreEntry *newEntry);
     void *operator new (size_t byteCount);
     void operator delete (void *address);
-    void start (request_t *, StoreEntry *);
+    void start (HttpRequest *, StoreEntry *);
     char *getHost (String &urlpath);
-    void setUriResFromRequest(request_t *);
-    bool RequestNeedsMenu(request_t *r);
-    void updateRequestURL(request_t *r, char const *newPath);
+    void setUriResFromRequest(HttpRequest *);
+    bool RequestNeedsMenu(HttpRequest *r);
+    void updateRequestURL(HttpRequest *r, char const *newPath);
     void createUriResRequest (String &uri);
 
     virtual ~UrnState();
@@ -61,8 +61,8 @@ public:
     StoreEntry *entry;
     store_client *sc;
     StoreEntry *urlres_e;
-    request_t *request;
-    request_t *urlres_r;
+    HttpRequest *request;
+    HttpRequest *urlres_r;
 
     struct
     {
@@ -187,13 +187,13 @@ UrnState::getHost (String &urlpath)
 }
 
 bool
-UrnState::RequestNeedsMenu(request_t *r)
+UrnState::RequestNeedsMenu(HttpRequest *r)
 {
     return strncasecmp(r->urlpath.buf(), "menu.", 5) == 0;
 }
 
 void
-UrnState::updateRequestURL(request_t *r, char const *newPath)
+UrnState::updateRequestURL(HttpRequest *r, char const *newPath)
 {
     char *new_path = xstrdup (newPath);
     r->urlpath = new_path;
@@ -213,7 +213,7 @@ UrnState::createUriResRequest (String &uri)
 }
 
 void
-UrnState::setUriResFromRequest(request_t *r)
+UrnState::setUriResFromRequest(HttpRequest *r)
 {
     if (RequestNeedsMenu(r)) {
         updateRequestURL(r, r->urlpath.buf() + 5);
@@ -236,7 +236,7 @@ UrnState::setUriResFromRequest(request_t *r)
 }
 
 void
-UrnState::start(request_t * r, StoreEntry * e)
+UrnState::start(HttpRequest * r, StoreEntry * e)
 {
     debug(52, 3) ("urnStart: '%s'\n", storeUrl(e));
     entry = e;
@@ -276,7 +276,7 @@ UrnState::created(StoreEntry *newEntry)
 }
 
 void
-urnStart(request_t * r, StoreEntry * e)
+urnStart(HttpRequest * r, StoreEntry * e)
 {
     UrnState *anUrn = new UrnState();
     anUrn->start (r, e);
diff --git a/src/wais.cc b/src/wais.cc
index e843abb68e..605b8784ae 100644
--- a/src/wais.cc
+++ b/src/wais.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: wais.cc,v 1.149 2003/06/20 01:01:01 robertc Exp $
+ * $Id: wais.cc,v 1.150 2003/08/10 11:00:45 robertc Exp $
  *
  * DEBUG: section 24    WAIS Relay
  * AUTHOR: Harvest Derived
@@ -51,7 +51,7 @@ public:
     method_t method;
     const HttpHeader *request_hdr;
     char url[MAX_URL];
-    request_t *request;
+    HttpRequest *request;
     FwdState *fwd;
     char buf[BUFSIZ];
     bool dataWritten;
@@ -253,7 +253,7 @@ void
 waisStart(FwdState * fwd)
 {
     WaisStateData *waisState = NULL;
-    request_t *request = fwd->request;
+    HttpRequest *request = fwd->request;
     StoreEntry *entry = fwd->entry;
     int fd = fwd->server_fd;
     const char *url = storeUrl(entry);
diff --git a/src/whois.cc b/src/whois.cc
index c7dc27b63e..0e4c420372 100644
--- a/src/whois.cc
+++ b/src/whois.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: whois.cc,v 1.26 2003/07/14 14:16:02 robertc Exp $
+ * $Id: whois.cc,v 1.27 2003/08/10 11:00:45 robertc Exp $
  *
  * DEBUG: section 75    WHOIS protocol
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -49,7 +49,7 @@ public:
     void readReply (int fd, char *buf, size_t len, comm_err_t flag, int xerrno);
     void setReplyToOK(StoreEntry *entry);
     StoreEntry *entry;
-    request_t *request;
+    HttpRequest *request;
     FwdState *fwd;
     char buf[BUFSIZ];
     bool dataWritten;