Merge branch 'master' of github.com:cyassl/cyassl

This commit is contained in:
John Safranek
2012-09-27 14:40:28 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -358,7 +358,7 @@ void client_test(void* args)
if (matchName && doPeerCheck) if (matchName && doPeerCheck)
CyaSSL_check_domain_name(ssl, domain); CyaSSL_check_domain_name(ssl, domain);
#ifdef NON_BLOCKING #ifdef NON_BLOCKING
CyaSSL_using_nonblock(ssl); CyaSSL_set_using_nonblock(ssl, 1);
tcp_set_nonblocking(&sockfd); tcp_set_nonblocking(&sockfd);
NonBlockingSSL_Connect(ssl); NonBlockingSSL_Connect(ssl);
#else #else

View File

@@ -294,7 +294,7 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
#endif #endif
#ifdef NON_BLOCKING #ifdef NON_BLOCKING
CyaSSL_using_nonblock(ssl); CyaSSL_set_using_nonblock(ssl, 1);
tcp_set_nonblocking(&clientfd); tcp_set_nonblocking(&clientfd);
NonBlockingSSL_Accept(ssl); NonBlockingSSL_Accept(ssl);
#else #else