From fe1fe64fd44bf46ea0f7c9b4bb2b1cb5637174cb Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 25 May 2007 21:56:27 +0000
Subject: Rob Crittenden fixed bug #1705802
 (http://curl.haxx.se/bug/view.cgi?id=1705802), which was filed by Daniel
 Black identifying several FTP-SSL test cases fail when we build libcurl with
 NSS for TLS/SSL. Listed as #42 in KNOWN_BUGS.

---
 lib/nss.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/nss.c b/lib/nss.c
index 652d9f1f7..ec7815400 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -74,6 +74,8 @@ PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
 static int initialized = 0;
 static int noverify = 0;
 
+#define HANDSHAKE_TIMEOUT 30
+
 typedef struct {
   PRInt32 retryCount;
   struct SessionHandle *data;
@@ -513,6 +515,12 @@ CURLcode Curl_nss_connect(struct connectdata * conn, int sockindex)
 
   SSL_SetURL(connssl->handle, conn->host.name);
 
+  /* Force the handshake now */
+  if (SSL_ForceHandshakeWithTimeout(connssl->handle,
+                                    PR_SecondsToInterval(HANDSHAKE_TIMEOUT))
+      != SECSuccess)
+    goto error;
+
   return CURLE_OK;
 
 error:
-- 
cgit v1.2.3