Rob Crittenden fixed SSL connections with NSS done with the multi-interface

diff --git a/CHANGES b/CHANGES
index c221766..88a7aff 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+
+Daniel S (18 Nov 2007)
+- Rob Crittenden fixed SSL connections with NSS done with the multi-interface
+
 Daniel S (17 Nov 2007)
 - Michal Marek made the test suite remember what test servers that fail to
   start so that subsequent tries are simply skipped.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5d71c7f..8106e9d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -23,6 +23,7 @@ This release includes the following bugfixes:
  o variable wrapping when using absolutely huge send buffer sizes
  o variable wrapping when using debug callback and the HTTP request wasn't sent
    in one go
+ o SSL connections with NSS done with the multi-interface
 
 This release includes the following known bugs:
 
@@ -41,6 +42,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Dan Fandrich, Gisle Vanem, Toby Peterson, Yang Tse, Daniel Black,
- Robin Johnson, Michal Marek, Ates Goral
+ Robin Johnson, Michal Marek, Ates Goral, Andres Garcia, Rob Crittenden
  
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/lib/sslgen.c b/lib/sslgen.c
index b76f807..a8f4e25 100644 (file)
--- a/lib/sslgen.c
+++ b/lib/sslgen.c
@@ -243,6 +243,7 @@ Curl_ssl_connect_nonblocking(struct connectdata *conn, int sockindex,
 #else
 #ifdef USE_NSS
   *done = TRUE; /* fallback to BLOCKING */
+  conn->ssl[sockindex].use = TRUE;
   return Curl_nss_connect(conn, sockindex);
 #else
 #ifdef USE_QSOSSL