Commit 9a6b442c authored by Manuel Pégourié-Gonnard's avatar Manuel Pégourié-Gonnard
Browse files

Fix non-blocking sockets in net_accept()

parent a04fa4fa
...@@ -4,6 +4,7 @@ PolarSSL ChangeLog (Sorted per branch, date) ...@@ -4,6 +4,7 @@ PolarSSL ChangeLog (Sorted per branch, date)
Bugfix Bugfix
* Support escaping of commas in x509_string_to_names() * Support escaping of commas in x509_string_to_names()
* Fix compile error in ssl_pthread_server (found by Julian Ospald). * Fix compile error in ssl_pthread_server (found by Julian Ospald).
* Fix net_accept() regarding non-blocking sockets (found by Luca Pesce).
Changes Changes
* Ciphersuites using SHA-256 or SHA-384 now require TLS 1.x (there is no * Ciphersuites using SHA-256 or SHA-384 now require TLS 1.x (there is no
......
...@@ -434,7 +434,7 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip ) ...@@ -434,7 +434,7 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip )
if( *client_fd < 0 ) if( *client_fd < 0 )
{ {
if( net_would_block( *client_fd ) != 0 ) if( net_would_block( bind_fd ) != 0 )
return( POLARSSL_ERR_NET_WANT_READ ); return( POLARSSL_ERR_NET_WANT_READ );
return( POLARSSL_ERR_NET_ACCEPT_FAILED ); return( POLARSSL_ERR_NET_ACCEPT_FAILED );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment