[svn] A lot of host name changes.

[wget] / src / retr.c

diff --git a/src/retr.c b/src/retr.c
index 93ef7db55f1e169ef18a3f93d6e5186519f4ba46..dc1587e4cf8b7d00febb707b2d4f511c5489f2fa 100644 (file)
--- a/src/retr.c
+++ b/src/retr.c
@@ -427,13 +427,21 @@ retrieve_url (const char *origurl, char **file, char **newloc,
     FREE_MAYBE (local_file);
 
   url_free (u);
-  if (redirections)
-    string_set_free (redirections);
 
-  if (newloc)
-    *newloc = url;
+  if (redirections)
+    {
+      string_set_free (redirections);
+      if (newloc)
+       *newloc = url;
+      else
+       xfree (url);
+    }
   else
-    xfree (url);
+    {
+      if (newloc)
+       *newloc = NULL;
+      xfree (url);
+    }
 
   ++global_download_count;
 
@@ -560,8 +568,18 @@ sleep_between_retrievals (int count)
            sleep (opt.waitretry);
        }
       else if (opt.wait)
-       /* Otherwise, check if opt.wait is specified.  If so, sleep.  */
-       sleep (opt.wait);
+       {
+         /* Otherwise, check if opt.wait is specified.  If so, sleep.  */
+         if (count > 1 || !opt.random_wait)
+           sleep (opt.wait);
+         else
+           {
+             int waitsecs = random() % (opt.wait * 2 + 1);
+             DEBUGP(("sleep_between_retrievals: norm=%ld,random=%ld,sleep=%d\n",
+                     opt.wait, waitsecs - opt.wait, waitsecs));
+             sleep(waitsecs);
+           }
+       }
     }
   if (first_retrieval)
     first_retrieval = 0;