[svn] After canonicalizing the URL, check for its existence among undesirable_urls.

Published in <sxs7kyeohte.fsf@florida.arsdigita.de>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2153783515303fbdd68fb8859e47991c414c6d1b..82b95296ec81eb83b12724c5c948129535437d21 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-14  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * recur.c (recursive_retrieve): Also check undesirable_urls with
+       canonicalized URL.
+
 2001-06-14  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * http.c (gethttp): Search `.netrc' with real host, not the proxy

diff --git a/src/recur.c b/src/recur.c
index 494e01a31374ced1c7e48c5a6c8ca620cebbc2a2..faa01e410f0ea646be32b018493419a5dc0f8981 100644 (file)
--- a/src/recur.c
+++ b/src/recur.c
@@ -381,7 +381,13 @@ recursive_retrieve (const char *file, const char *this_url)
            }
          xfree (constr);
          constr = xstrdup (u->url);
-         string_set_add (undesirable_urls, constr);
+         /* After we have canonicalized the URL, check if we have it
+            on the black list. */
+         if (string_set_contains (undesirable_urls, constr))
+           inl = 1;
+         /* This line is bogus. */
+         /*string_set_add (undesirable_urls, constr);*/
+
          if (!inl && !((u->proto == URLFTP) && !this_url_ftp))
            if (!opt.spanhost && this_url && !same_host (this_url, constr))
              {