Allow for URL escapes in the login:password string. This to enable the use

of users or passwords with spaces in them (%20)

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index b4bcfa60e7d7cbab6be3687bdd3f3e2c1dd5f861..c813e7f7c4b678eb9094f628352ae749e69aab7d 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.371 2001/01/25 23:01:56 hno Exp $
+ * $Id: cache_cf.cc,v 1.372 2001/01/28 00:45:45 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -1232,6 +1232,7 @@ parse_peer(peer ** head)
 #endif
        } else if (!strncasecmp(token, "login=", 6)) {
            p->login = xstrdup(token + 6);
+           rfc1738_unescape(p->login);
        } else if (!strncasecmp(token, "connect-timeout=", 16)) {
            p->connect_timeout = atoi(token + 16);
 #if USE_CACHE_DIGESTS

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 9779c3ec8dc913445a4d43aab1617afbbf706afd..34f9a2eb2bc665471dcd49d3aa8e2990282db323 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.208 2001/01/25 22:54:52 hno Exp $
+# $Id: cf.data.pre,v 1.209 2001/01/28 00:45:45 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -279,6 +279,8 @@ DOC_START
 
                     use 'login=user:password' if this is a personal/workgroup
                     proxy and your parent requires proxy authentication.
+                    Note: The string can include URL escapes (i.e. %20 for
+                    spaces). This also means that % must be written as %%.
 
                     use 'login=PASS' if users must authenticate against
                     the upstream proxy. Note: To combine this with