From: Seven Du Date: Fri, 13 Dec 2013 03:46:14 +0000 (+0800) Subject: FS-5642 --resolve add back the ETIMEDOUT check, needed on Mac X-Git-Tag: v1.4.2~2^2~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5b18c0fdd91c1e5690e11819fcf769124881806;p=thirdparty%2Ffreeswitch.git FS-5642 --resolve add back the ETIMEDOUT check, needed on Mac --- diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c index 41df93fdcf..f5534d6175 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c @@ -290,7 +290,7 @@ int ws_handshake(wsh_t *wsh) ws_raw_write(wsh, respond, strlen(respond)); wsh->handshake = 1; - + return 0; err: @@ -809,7 +809,7 @@ int xp_errno(void) int xp_is_blocking(int errcode) { - return errcode == EAGAIN || errcode == EWOULDBLOCK || errcode == EINPROGRESS || errcode == EINTR; + return errcode == EAGAIN || errcode == EWOULDBLOCK || errcode == EINPROGRESS || errcode == EINTR || errcode == ETIMEDOUT; } #endif