aboutsummaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-03-25 11:11:29 -0700
committerDavid 'Digit' Turner <digit@google.com>2010-03-25 14:19:42 -0700
commitce0f4b02160ee72d7d2428867fe757bc37c68c98 (patch)
tree13dee7797fad78fbde1fcb2869f7b85e26622e39 /telephony
parentca52b2260ba9f9bac07092c3d8260ed523de1fe1 (diff)
downloadexternal_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.zip
external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.tar.gz
external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.tar.bz2
Fix Win32 socket error handling.
This also fixes -http-proxy support on Windows. Change-Id: I741b224511c064412ac39351ed4f1b9146a313a5
Diffstat (limited to 'telephony')
-rw-r--r--telephony/sysdeps_qemu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/sysdeps_qemu.c b/telephony/sysdeps_qemu.c
index a88f2fb..48cd81c 100644
--- a/telephony/sysdeps_qemu.c
+++ b/telephony/sysdeps_qemu.c
@@ -248,7 +248,7 @@ sys_channel_read( SysChannel channel, void* buffer, int size )
if (ret < 0) {
if (errno == EINTR)
continue;
- if (errno == EWOULDBLOCK)
+ if (errno == EWOULDBLOCK || errno == EAGAIN)
break;
D( "%s: after reading %d bytes, recv() returned error %d: %s\n",
__FUNCTION__, size - len, errno, errno_str);
@@ -275,7 +275,7 @@ sys_channel_write( SysChannel channel, const void* buffer, int size )
if (ret < 0) {
if (errno == EINTR)
continue;
- if (errno == EWOULDBLOCK)
+ if (errno == EWOULDBLOCK || errno == EAGAIN)
break;
D( "%s: send() returned error %d: %s\n",
__FUNCTION__, errno, errno_str);