From 4b351d018e3d6691191fd653a17f14f4a31e0b4c Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 23 Mar 2010 23:29:23 +0100
Subject: [PATCH] mark connection as connected

Kenny To filed the bug report #2963679 with patch to fix a
problem he experienced with doing multi interface HTTP POST over
a proxy using PROXYTUNNEL. He found a case where it would connect
fine but bits.tcpconnect was not set correct so libcurl didn't
work properly.

(http://curl.haxx.se/bug/view.cgi?id=2963679)
---
 CHANGES       | 7 +++++++
 RELEASE-NOTES | 3 ++-
 lib/connect.c | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 5fe6337b8e..dd07f31a0d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,13 @@
                                   Changelog
 
 Daniel Stenberg (23 Mar 2010)
+- Kenny To filed the bug report #2963679 with patch to fix a problem he
+  experienced with doing multi interface HTTP POST over a proxy using
+  PROXYTUNNEL. He found a case where it would connect fine but bits.tcpconnect
+  was not set correct so libcurl didn't work properly.
+
+  (http://curl.haxx.se/bug/view.cgi?id=2963679)
+
 - Akos Pasztory filed debian bug report #572276
   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572276 mentioning a problem
   with a resource that returns chunked-encoded _and_ with a Content-Length
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c682b9cb78..ceb68113f3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,6 +38,7 @@ This release includes the following bugfixes:
  o alarm()-based DNS timeout bug
  o re-used FTP connection multi interface crash
  o chunked-encoding with Content-Length: header problem
+ o multi interface HTTP POST over a proxy using PROXYTUNNEL
 
 This release includes the following known bugs:
 
@@ -50,6 +51,6 @@ advice from friends like these:
  Daniel Fandrich, Patrick Monnerat, Pat Ray, Wesley Miaw, Ben Greear,
  Ryan Chan, Markus Duft, Andrei Benea, Jacob Moshenko, Daniel Johnson,
  Constantine Sapuntzakis, Douglas Steinwand, Thomas Lopatic, Hauke Duden,
- Akos Pasztory
+ Akos Pasztory, Kenny To
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/connect.c b/lib/connect.c
index 5e94b86731..c0f2012a88 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -574,6 +574,7 @@ CURLcode Curl_is_connected(struct connectdata *conn,
     int error;
     if(verifyconnect(sockfd, &error)) {
       /* we are connected, awesome! */
+      conn->bits.tcpconnect = TRUE;
       *connected = TRUE;
       return CURLE_OK;
     }