- Bug report #2779733 (http://curl.haxx.se/bug/view.cgi?id=2779733) by Sven

  Wegener pointed out that CURLINFO_APPCONNECT_TIME didn't work with the multi
  interface and provided a patch that fixed the problem!

diff --git a/CHANGES b/CHANGES
index 33bff52..76d7470 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,10 +6,15 @@
 
                                   Changelog
 
+Daniel Stenberg (26 Apr 2009)
+- Bug report #2779733 (http://curl.haxx.se/bug/view.cgi?id=2779733) by Sven
+  Wegener pointed out that CURLINFO_APPCONNECT_TIME didn't work with the multi
+  interface and provided a patch that fixed the problem!
+
 Daniel Stenberg (24 Apr 2009)
 - Kamil Dudka fixed another NSS-related leak when client certs were used.
 
-- bug report #2779245 (http://curl.haxx.se/bug/view.cgi?id=2779245) by Rainer
+- Bug report #2779245 (http://curl.haxx.se/bug/view.cgi?id=2779245) by Rainer
   Koenig pointed out that the man page didn't tell that the *_proxy
   environment variables can be specified lower case or UPPER CASE and the
   lower case takes precedence,

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ace20e5..243d7ae 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -31,6 +31,7 @@ This release includes the following bugfixes:
  o persistent connections when doing FTP over a HTTP proxy
  o --libcurl bogus strings where other data was pointed to
  o crash related to FTP and "Re-used connection seems dead, get a new one"
+ o CURLINFO_APPCONNECT_TIME with the multi interface
 
 This release includes the following known bugs:
 
@@ -42,6 +43,6 @@ advice from friends like these:
  Daniel Fandrich, Yang Tse, David James, Chris Deidun, Bill Egert,
  Andre Guibert de Bruet, Andreas Farber, Frank Hempel, Pierre Brico,
  Kamil Dudka, Jim Freeman, Daniel Johnson, Toshio Kuratomi, Martin Storsjo,
- Pramod Sharma, Gisle Vanem, Leanic Lefever, Rainer Koenig
+ Pramod Sharma, Gisle Vanem, Leanic Lefever, Rainer Koenig, Sven Wegener
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/sslgen.c b/lib/sslgen.c
index 8325dcc..f512a88 100644 (file)
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -195,9 +195,13 @@ Curl_ssl_connect_nonblocking(struct connectdata *conn, int sockindex,
                              bool *done)
 {
 #ifdef curlssl_connect_nonblocking
+  CURLcode res;
   /* mark this is being ssl requested from here on. */
   conn->ssl[sockindex].use = TRUE;
-  return curlssl_connect_nonblocking(conn, sockindex, done);
+  res = curlssl_connect_nonblocking(conn, sockindex, done);
+  if(!res && *done == TRUE)
+    Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */
+  return res;
 #else
   *done = TRUE; /* fallback to BLOCKING */
   conn->ssl[sockindex].use = TRUE;