From: rousskov <>
Date: Tue, 24 Feb 1998 06:47:20 +0000 (+0000)
Subject: - Removed unused urlClean() function from url.c.
X-Git-Tag: SQUID_3_0_PRE1~4014
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef65d6ca66c3b21d0a6377387287440c546fc3d7;p=thirdparty%2Fsquid.git

- Removed unused urlClean() function from url.c.

- Fixed a bug that allow '?' parts of urls to be recorded in store.log.
  Logged urls are now "clean".
---

diff --git a/ChangeLog b/ChangeLog
index 8aac6bcf8d..3409cdc241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Future/Current Changes to squid-1.2.beta16 (Feb 23, 1998):
 
+	- Removed unused urlClean() function from url.c.	
+
+	- Fixed a bug that allow '?' parts of urls to be recorded in
+	  store.log.  Logged urls are now "clean".
+
 	- Cache Manager got new Web interface (cachemgr.cgi). New .cgi script
 	  forwards basic authentication from browser to squid. Authentication
 	  info is encoded within all dynamically generated pages so you do not
diff --git a/src/client_side.cc b/src/client_side.cc
index d15f211f86..acc0f1ba34 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.212 1998/02/21 00:56:50 rousskov Exp $
+ * $Id: client_side.cc,v 1.213 1998/02/23 23:47:21 rousskov Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -595,7 +595,8 @@ httpRequestFree(void *data)
 	mem = entry->mem_obj;
     if (http->out.size || http->log_type) {
 	http->al.icp.opcode = 0;
-	http->al.url = http->uri;
+	http->al.url = http->log_uri;
+	debug(33, 9) ("httpRequestFree: al.url='%s'\n", http->al.url);
 	if (mem) {
 	    http->al.http.code = mem->reply->sline.status;
 	    http->al.http.content_type = httpReplyContentType(mem->reply);
diff --git a/src/protos.h b/src/protos.h
index 5d25c8b762..b8cbef4538 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -619,7 +619,6 @@ extern void requestUnlink(request_t *);
 extern int matchDomainName(const char *d, const char *h);
 extern int urlCheckRequest(const request_t *);
 extern int urlDefaultPort(protocol_t p);
-extern char *urlClean(char *);
 extern char *urlCanonicalClean(const request_t *);
 
 extern void useragentOpenLog(void);
diff --git a/src/url.cc b/src/url.cc
index 9893e32b80..e13108c378 100644
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.77 1998/02/20 18:47:06 wessels Exp $
+ * $Id: url.cc,v 1.78 1998/02/23 23:47:23 rousskov Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -369,19 +369,6 @@ urlCanonicalClean(const request_t * request)
     return buf;
 }
 
-char *
-urlClean(char *dirty)
-{
-    char *clean;
-    request_t *r = urlParse(METHOD_GET, dirty);
-    if (r == NULL)
-	return dirty;
-    clean = urlCanonicalClean(r);
-    memFree(MEM_REQUEST_T, r);
-    return clean;
-}
-
-
 request_t *
 requestLink(request_t * request)
 {