From: hniksic <devnull@localhost>
Date: Sat, 15 Nov 2003 02:03:23 +0000 (-0800)
Subject: [svn] Fix call to socket_ip_address.
X-Git-Tag: v1.13~1395
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=36387204b0403d43fa6951b6cd8586489a302ded

[svn] Fix call to socket_ip_address.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 270d937c..a0127f10 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-15  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* http.c (persistent_available_p): Correctly specify the endpoint
+	argument to socket_ip_address.
+	(gethttp): When printing the "reusing connection to..." message,
+	specify the host name of the reused connection, not the current
+	host name.  That makes more sense because it provides a useful
+	piece of information -- we know to which host we're supposed to
+	connect anyway!
+
 2003-11-15  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* init.c: Make sure the options are in alphabetic order!
diff --git a/src/http.c b/src/http.c
index 71006d12..d594e850 100644
--- a/src/http.c
+++ b/src/http.c
@@ -460,7 +460,7 @@ persistent_available_p (const char *host, int port, int ssl,
 	 resolves to, pconn.socket is for all intents and purposes
 	 already talking to HOST.  */
 
-      if (!socket_ip_address (pconn.socket, &ip, 0))
+      if (!socket_ip_address (pconn.socket, &ip, ENDPOINT_PEER))
 	{
 	  /* Can't get the peer's address -- something must be very
 	     wrong with the connection.  */
@@ -739,10 +739,8 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
     }
   else
     {
-      logprintf (LOG_VERBOSE, _("Reusing connection to %s:%hu.\n"),
-		 conn->host, conn->port);
-      /* #### pc_last_fd should be accessed through an accessor
-         function.  */
+      logprintf (LOG_VERBOSE, _("Reusing existing connection to %s:%d.\n"),
+		 pconn.host, pconn.port);
       sock = pconn.socket;
       using_ssl = pconn.ssl;
       DEBUGP (("Reusing fd %d.\n", sock));