diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-07-27 13:11:38 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-07-27 13:11:38 +0400 |
| commit | 9869e006f3ac34d7bd67fb6327f3605725995abc (patch) | |
| tree | a4649e2504fc1caae8493a2583962aacd1cd737e /winsup/cygwin/select.cc | |
| parent | 40f67ea198cf8b2bd27e87614065717613b2ff8b (diff) | |
* fhandler.h (class fhandler_socket): Remove prot_info_ptr.
(fhandler_socket::fixup_before_fork_exec): Remove.
(fhandler_socket::fixup_after_exec): Remove.
(fhandler_socket::need_fixup_before): Remove.
* fhandler_socket.cc (fhandler_socket::fhandler_socket): Drop
initializing prot_info_ptr. Remove unused code.
(fhandler_socket::~fhandler_socket): Drop free'ing prot_info_ptr.
(struct wsa_event): Rename connect_errorcode to errorcode.
(fhandler_socket::evaluate_events): Handle FD_CLOSE error condition
as FD_CONNECT error condition, except, never reset an FD_CLOSE error
condition. Always set FD_WRITE after successfully recorded FD_CONNECT.
(fhandler_socket::fixup_before_fork_exec): Remove.
(fhandler_socket::fixup_after_fork): Revert to using handle duplication.
(fhandler_socket::fixup_after_exec): Remove.
(fhandler_socket::dup): Revert to using handle duplication.
(fhandler_socket::send_internal): Only call wait_for_events in case
of WSAEWOULDBLOCK condition.
(fhandler_socket::set_close_on_exec): Call
fhandler_base::set_close_on_exec.
* net.cc (fdsock): Just set socket to inheritable on non-NT. Don't
call inc_need_fixup_before.
* select.cc (peek_socket): Don't set except_ready on every FD_CLOSE,
just on error.
Diffstat (limited to 'winsup/cygwin/select.cc')
| -rw-r--r-- | winsup/cygwin/select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index a1abba610..abfe9e5a3 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -1279,7 +1279,7 @@ peek_socket (select_record *me, bool) me->write_ready |= !!(events & (FD_WRITE | FD_CLOSE)); } if (me->except_selected) - me->except_ready |= ret || !!(events & (FD_OOB | FD_CLOSE)); + me->except_ready |= ret || !!(events & FD_OOB); return me->read_ready || me->write_ready || me->except_ready; } |