aboutsummaryrefslogtreecommitdiffstats
path: root/net-android.c
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 /net-android.c
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 'net-android.c')
-rw-r--r--net-android.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net-android.c b/net-android.c
index da01a61..b7db44a 100644
--- a/net-android.c
+++ b/net-android.c
@@ -1607,7 +1607,7 @@ static void net_socket_send(void *opaque)
size = recv(s->fd, (void *)buf1, sizeof(buf1), 0);
if (size < 0) {
err = socket_error();
- if (err != EWOULDBLOCK)
+ if (err != EWOULDBLOCK && err != EAGAIN)
goto eoc;
} else if (size == 0) {
/* end of connection */