From a26ab6e3e05f8a433b790a890b5ac2ebf4e9d6b6 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 26 Jun 2013 23:10:19 -0400
Subject: [PATCH] fix ssl connect race

---
 libs/sofia-sip/.update                    |  2 +-
 libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 29 +++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 0440205a53..d8abd49c6d 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Jun 26 12:43:51 EDT 2013
+Wed Jun 26 23:10:11 EDT 2013
diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
index 46e41d133b..1a0a2f3250 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
@@ -379,7 +379,8 @@ int ws_init(wsh_t *wsh, ws_socket_t sock, size_t buflen, SSL_CTX *ssl_ctx, int c
 
 	if (wsh->secure) {
 		int code;
-
+		int sanity = 500;
+		
 		wsh->ssl = SSL_new(ssl_ctx);
 		assert(wsh->ssl);
 
@@ -387,8 +388,32 @@ int ws_init(wsh_t *wsh, ws_socket_t sock, size_t buflen, SSL_CTX *ssl_ctx, int c
 
 		do {
 			code = SSL_accept(wsh->ssl);
-		} while (code == -1 && SSL_get_error(wsh->ssl, code) == SSL_ERROR_WANT_READ);
 
+			if (code == 1) {
+				break;
+			}
+
+			if (code == 0) {
+				return -1;
+			}
+			
+			if (code < 0) {
+				if (code == -1 && SSL_get_error(wsh->ssl, code) != SSL_ERROR_WANT_READ) {
+					return -1;
+				}
+			}
+#ifndef _MSC_VER
+				usleep(10000);
+#else
+				Sleep(10);
+#endif				
+				
+		} while (--sanity > 0);
+		
+		if (!sanity) {
+			return -1;
+		}
+		
 	}
 
 	while (!wsh->down && !wsh->handshake) {