From: Tomas Hozza <thozza@redhat.com>
Date: Thu, 11 Jul 2013 11:22:43 +0000 (+0200)
Subject: Set sock variable to -1 if no persistent conn exists
X-Git-Tag: v1.15~43
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=8760123cee87e07a276b8b13ef48ada3a490ad47

Set sock variable to -1 if no persistent conn exists

Wget should set sock variable to -1 if no persistent
connection exists. Function persistent_available_p()
tests persistent connection but if test_socket_open()
fails it closes the socket but will not set sock variable
to -1. After returning from persistent_available_p()
it is possible that sock has still value of already
closed connection.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b978ebb..d5040115 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,9 @@
-2013-04-26  Tomas Hozza  <thozza@redhat.com> (tiny change)
+2013-03-20  Tomas Hozza  <thozza@redhat.com>
+
+	* http.c (gethttp): Set "sock" to -1 if it's not and we have no
+	persistent connection
+
+2013-04-26  Tomas Hozza  <thozza@redhat.com>
 
 	* log.c (redirect_output): Use DEFAULT_LOGFILE in diagnostic message
 	when `logfile' is NULL.
diff --git a/src/http.c b/src/http.c
index 669f0fe3..a6933551 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1983,6 +1983,10 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
                     exec_name, quote (relevant->host));
           return HOSTERR;
         }
+      else if (sock != -1)
+        {
+          sock = -1;
+        }
     }
 
   if (sock < 0)