X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fhttp.c;h=1a276e66a3b7c869f219d76b517ebc484cf4ce8d;hb=319f52d756238aca0ba7c671f529d336757806c5;hp=5eb256ba06ac7500069814b53b7b727442739a13;hpb=74fbb03b10f6148b5a0cf5b8831b1872e55df7f6;p=wget

diff --git a/src/http.c b/src/http.c
index 5eb256ba..1a276e66 100644
--- a/src/http.c
+++ b/src/http.c
@@ -59,7 +59,6 @@ so, delete this exception statement from your version.  */
 #include "convert.h"
 
 extern char *version_string;
-extern LARGE_INT total_downloaded_bytes;
 
 extern FILE *output_stream;
 extern bool output_stream_regular;
@@ -1706,7 +1705,6 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
   /* Handle (possibly multiple instances of) the Set-Cookie header. */
   if (opt.cookies)
     {
-      char *pth = NULL;
       int scpos;
       const char *scbeg, *scend;
       /* The jar should have been created by now. */
@@ -1717,15 +1715,8 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
 	   ++scpos)
 	{
 	  char *set_cookie; BOUNDED_TO_ALLOCA (scbeg, scend, set_cookie);
-	  if (pth == NULL)
-	    {
-	      /* u->path doesn't begin with /, which cookies.c expects. */
-	      pth = (char *) alloca (1 + strlen (u->path) + 1);
-	      pth[0] = '/';
-	      strcpy (pth + 1, u->path);
-	    }
-	  cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port, pth,
-				    set_cookie);
+	  cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port,
+				    u->path, set_cookie);
 	}
     }
 
@@ -1846,7 +1837,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
 	  logputs (LOG_VERBOSE, _("Length: "));
 	  if (contlen != -1)
 	    {
-	      logputs (LOG_VERBOSE, with_thousand_seps (contlen + contrange));
+	      logputs (LOG_VERBOSE, number_to_static_string (contlen + contrange));
 	      if (contlen + contrange >= 1024)
 		logprintf (LOG_VERBOSE, " (%s)",
 			   human_readable (contlen + contrange));
@@ -1854,11 +1845,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
 		{
 		  if (contlen >= 1024)
 		    logprintf (LOG_VERBOSE, _(", %s (%s) remaining"),
-			       with_thousand_seps (contlen),
+			       number_to_static_string (contlen),
 			       human_readable (contlen));
 		  else
 		    logprintf (LOG_VERBOSE, _(", %s remaining"),
-			       with_thousand_seps (contlen));
+			       number_to_static_string (contlen));
 		}
 	    }
 	  else
@@ -1978,7 +1969,8 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
   bool use_ts, got_head = false;/* time-stamping info */
   char *filename_plus_orig_suffix;
   char *local_filename = NULL;
-  char *tms, *locf, *tmrate;
+  char *tms, *locf;
+  const char *tmrate;
   uerr_t err;
   time_t tml = -1, tmr = -1;	/* local and remote time-stamps */
   wgint local_size = 0;		/* the size of the local file */
@@ -2004,7 +1996,7 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
   *newloc = NULL;
 
   /* Warn on (likely bogus) wildcard usage in HTTP.  */
-  if (has_wildcards_p (u->path))
+  if (opt.ftp_glob && has_wildcards_p (u->path))
     logputs (LOG_VERBOSE, _("Warning: wildcards not supported in HTTP.\n"));
 
   xzero (hstat);
@@ -2368,7 +2360,8 @@ The sizes do not match (local %s) -- retrieving.\n"),
 	  return RETROK;
 	}
 
-      tmrate = retr_rate (hstat.rd_size, hstat.dltime, 0);
+      tmrate = retr_rate (hstat.rd_size, hstat.dltime);
+      total_download_time += hstat.dltime;
 
       if (hstat.len == hstat.contlen)
 	{