aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-11-18 09:45:05 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-11-18 09:45:05 +0000
commitc80b9c3778597058f60b40b439bcf09a400d0012 (patch)
tree899c622d1cc2f02791092fdb36c10e5443700b8c
parent536f98a766143cf8c3222642cb5c00b4f994701a (diff)
Rob Crittenden fixed SSL connections with NSS done with the multi-interface
-rw-r--r--CHANGES4
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/sslgen.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index c221766d4..88a7affca 100644
--- 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 5d71c7f50..8106e9d7a 100644
--- 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 b76f807b8..a8f4e2539 100644
--- 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