diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-12-05 13:37:05 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-12-05 13:37:05 +0000 |
commit | 3ce43764be4c7b58481b4b7a7d9b77e2c02724cf (patch) | |
tree | 688a6f4229c37c04b92f67ea2af3505622f3845e /lib | |
parent | b555c60e49c07975932756c881bcc086d8a05d52 (diff) |
Matt Witherspoon fixed a problem case when the CPU load went to 100% when a
HTTP upload was disconnected:
"What appears to be happening is that my system (Linux 2.6.17 and 2.6.13) is
setting *only* POLLHUP on poll() when the conditions in my previous mail
occur. As you can see, select.c:Curl_select() does not check for POLLHUP. So
basically what was happening, is poll() was returning immediately (with
POLLHUP set), but when Curl_select() looked at the bits, neither POLLERR or
POLLOUT was set. This still caused Curl_readwrite() to be called, which
quickly returned. Then the transfer() loop kept continuing at full speed
forever."
Diffstat (limited to 'lib')
-rw-r--r-- | lib/select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/select.c b/lib/select.c index b25067b6c..672e5b8cf 100644 --- a/lib/select.c +++ b/lib/select.c @@ -124,7 +124,7 @@ int Curl_select(curl_socket_t readfd, curl_socket_t writefd, int timeout_ms) if (writefd != CURL_SOCKET_BAD) { if (pfd[num].revents & POLLOUT) ret |= CSELECT_OUT; - if (pfd[num].revents & POLLERR) + if (pfd[num].revents & (POLLERR|POLLHUP)) ret |= CSELECT_ERR; } |