diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-03-25 11:11:29 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-03-25 14:19:42 -0700 |
| commit | ce0f4b02160ee72d7d2428867fe757bc37c68c98 (patch) | |
| tree | 13dee7797fad78fbde1fcb2869f7b85e26622e39 /slirp-android | |
| parent | ca52b2260ba9f9bac07092c3d8260ed523de1fe1 (diff) | |
| download | external_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 'slirp-android')
| -rw-r--r-- | slirp-android/tcp_input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/slirp-android/tcp_input.c b/slirp-android/tcp_input.c index 9ecd2eb..c70e3f2 100644 --- a/slirp-android/tcp_input.c +++ b/slirp-android/tcp_input.c @@ -673,7 +673,8 @@ findso: goto cont_input; } - if((tcp_fconnect(so) == -1) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK)) { + if((tcp_fconnect(so) == -1) && (errno != EINPROGRESS) && + (errno != EWOULDBLOCK) && (errno != EAGAIN)) { u_char code=ICMP_UNREACH_NET; DEBUG_MISC((dfd," tcp fconnect errno = %d-%s\n", errno,errno_str)); |