Fixes Brian Akins' reported problems with duplicate Host: headers on re-used

connections.

diff --git a/lib/http.c b/lib/http.c
index d1128d4998bac7171ca6a3d6d6ea524d9099b03b..4b3e7dfb467a4264758bbd564c6fc9913da82808 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -1351,6 +1351,8 @@ CURLcode Curl_http(struct connectdata *conn)
     }
   }
 
+  Curl_safefree(conn->allocptr.host);
+
   ptr = checkheaders(data, "Host:");
   if(ptr && !data->state.this_is_a_follow) {
     /* If we have a given custom Host: header, we extract the host name in
@@ -1374,10 +1376,10 @@ CURLcode Curl_http(struct connectdata *conn)
       memcpy(conn->allocptr.cookiehost, start, len);
       conn->allocptr.cookiehost[len]=0;
     }
+
+    conn->allocptr.host = NULL;
   }
   else {
-    Curl_safefree(conn->allocptr.host);
-
     /* When building Host: headers, we must put the host name within
        [brackets] if the host name is a plain IPv6-address. RFC2732-style. */