X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Frecur.c;h=66ef2e0fd9b566d0c9c809562daa2d4ee32ddb70;hp=83a9b4ee84d5b155196263841ea37214fd3d014c;hb=b014f8fae9291e7504c0cca2dd8b9a0035466c03;hpb=4f3dd6817348433eafde04a3c2946f43364de7ef

diff --git a/src/recur.c b/src/recur.c
index 83a9b4ee..66ef2e0f 100644
--- a/src/recur.c
+++ b/src/recur.c
@@ -111,7 +111,8 @@ url_enqueue (struct url_queue *queue, struct iri *i,
   if (queue->count > queue->maxcount)
     queue->maxcount = queue->count;
 
-  DEBUGP (("Enqueuing %s at depth %d\n", url, depth));
+  DEBUGP (("Enqueuing %s at depth %d\n",
+           quotearg_n_style (0, escape_quoting_style, url), depth));
   DEBUGP (("Queue count %d, maxcount %d.\n", queue->count, queue->maxcount));
 
   if (i)
@@ -152,7 +153,8 @@ url_dequeue (struct url_queue *queue, struct iri **i,
 
   --queue->count;
 
-  DEBUGP (("Dequeuing %s at depth %d\n", qel->url, qel->depth));
+  DEBUGP (("Dequeuing %s at depth %d\n",
+           quotearg_n_style (0, escape_quoting_style, qel->url), qel->depth));
   DEBUGP (("Queue count %d, maxcount %d.\n", queue->count, queue->maxcount));
 
   xfree (qel);
@@ -278,10 +280,10 @@ retrieve_tree (struct url *start_url_parsed, struct iri *pi)
         {
           int dt = 0, url_err;
           char *redirected = NULL;
-          struct url *url_parsed = url_parse (url, &url_err, i, false);
+          struct url *url_parsed = url_parse (url, &url_err, i, true);
 
           status = retrieve_url (url_parsed, url, &file, &redirected, referer,
-                                 &dt, false, i);
+                                 &dt, false, i, true);
 
           if (html_allowed && file && status == RETROK
               && (dt & RETROKF) && (dt & TEXTHTML))
@@ -320,6 +322,11 @@ retrieve_tree (struct url *start_url_parsed, struct iri *pi)
               xfree (url);
               url = redirected;
             }
+          else
+            {
+              xfree (url);
+              url = xstrdup (url_parsed->url);
+            }
           url_free(url_parsed);
         }
 
@@ -373,7 +380,7 @@ retrieve_tree (struct url *start_url_parsed, struct iri *pi)
           if (children)
             {
               struct urlpos *child = children;
-              struct url *url_parsed = url_parse (url, NULL, i, false);
+              struct url *url_parsed = url_parse (url, NULL, i, true);
               struct iri *ci;
               char *referer_url = url;
               bool strip_auth = (url_parsed != NULL