Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

Fix nonblocking connect on Windows

Browse source 
Use the correct value for the call to ioctlsocket() to set the socket to
nonblocking mode and check for WSAWOULDBLOCK return value of connect().
This commit is contained in:
Patrick Gansterer 2014-03-27 11:21:41 +01:00
parent 7844d04adc
commit 236bc6bc4e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/client-handshake.c
View file

@ -177,7 +177,8 @@ struct libwebsocket *libwebsocket_client_connect_2(
if (connect(wsi->sock, v, n) == -1 || LWS_ERRNO == LWS_EISCONN) {
if (LWS_ERRNO == LWS_EALREADY || LWS_ERRNO == LWS_EINPROGRESS) {
if (LWS_ERRNO == LWS_EALREADY || LWS_ERRNO == LWS_EINPROGRESS
|| LWS_ERRNO == LWS_EWOULDBLOCK) {
lwsl_client("nonblocking connect retry\n");
/*

2
lib/libwebsockets.c
View file

@ -694,7 +694,7 @@ int lws_set_socket_options(struct libwebsocket_context *context, int fd)
int optval = 1;
socklen_t optlen = sizeof(optval);
#if defined(WIN32) || defined(_WIN32)
unsigned long optl = 0;
u_long optl = 1;
#endif
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
struct protoent *tcp_proto;