- 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 8aac6bcf8d088c6d1185123ad998da386dfc27a5..3409cdc241bc04aec184ca1076284c5724463b85 100644 (file)
--- 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 d15f211f867044695e3f12d84d119acae96ce926..acc0f1ba3490b0eb293fcbc605472aa8bd4a4c9c 100644 (file)
--- 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 5d25c8b76243a16d22cd609dda5a033a23dd8e8d..b8cbef4538b078b42a60d537256207d8dc430752 100644 (file)
--- 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 9893e32b8023aa555ae0522b5abf8a1450e78501..e13108c378011a95603906eb4f5a6941ecec0b6e 100644 (file)
--- 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)
 {