diff options
| author | Steve Huston <shuston@riverace.com> | 2012-11-29 15:10:38 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-11-29 15:10:38 +0000 |
| commit | d7705de4130a361bedb47fd3fc3a63cb0430d4dd (patch) | |
| tree | 61cfcb23c428e1f395757e6d6b6cd2701cbd4a24 | |
| parent | f132d266d4a6c262a3dd8b694fb42301232310bc (diff) | |
| download | ATCD-d7705de4130a361bedb47fd3fc3a63cb0430d4dd.tar.gz | |
ChangeLogTag:Thu Nov 29 15:08:26 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/ACE.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4cbc1938005..d2c8d3b12fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 29 15:08:26 UTC 2012 Steve Huston <shuston@riverace.com> + + * ace/ACE.cpp (handle_timed_complete): Adapt to an occasionally seen + scenario where only the POLLERR bit is set on a failed connect. + This is for the poll() case, not select(). + Tue Nov 20 23:55:57 UTC 2012 Steve Huston <shuston@riverace.com> * ace/config-hpux-11.00.h: diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 3fedcc67109..5a425973294 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -2548,7 +2548,13 @@ ACE::handle_timed_complete (ACE_HANDLE h, else # if defined (ACE_HAS_POLL) - need_to_check = (fds.revents & POLLIN); + { + // The "official" bit for failed connect is POLLIN. However, POLLERR + // is often set and there are occasional cases seen with some kernels + // where only POLLERR is set on a failed connect. + need_to_check = (fds.revents & POLLIN) || (fds.revents & POLLERR); + known_failure = (fds.revents & POLLERR) + } # else need_to_check = true; # endif /* ACE_HAS_POLL */ |