Skip to content

Commit

Permalink
Fix win32 connect() event handling.
Browse files Browse the repository at this point in the history
Christopher Davis reported:

    Connection failures aren't reported on Windows when
    using bufferevent_socket_connect, because Windows uses
    select's exceptfds to notify of failure, and libevent
    treats them like read events. Only the write event
    handler is currently used to handle connection events.

We should think hard about this one, since it changes
behavior from 1.4.x.  Anything that worked on Mac/Unix before
will work more consistently on Windows now... but this might
break stuff that worked only on Windows, but nowhere else.

Patch from Chris Davis.

svn:r1454
  • Loading branch information
nmathewson committed Oct 21, 2009
1 parent b89b58b commit d8164d0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -30,6 +30,7 @@ Changes in 2.0.3-alpha:
o Fix compilation for listener.h for C++ - missing extern "C". Patch from Ferenc Szalai.
o Make the event_base_loop() family of functions respect thread-safety better. This should clear up a few hard-to-debug race conditions.
o Fix a bug when using a specialized memory allocator on win32.
o Have the win32 select() backend label TCP-socket-connected events as EV_WRITE, not EV_READ. This should bring it in line with the other backends, and improve portability. Patch from Christopher Davis.


Changes in 2.0.2-alpha:
Expand Down
4 changes: 2 additions & 2 deletions WIN32-Code/win32.c
Expand Up @@ -296,7 +296,7 @@ win32_dispatch(struct event_base *base, struct timeval *tv)
}

fd_set_copy(win32op->readset_out, win32op->readset_in);
fd_set_copy(win32op->exset_out, win32op->readset_in);
fd_set_copy(win32op->exset_out, win32op->writeset_in);
fd_set_copy(win32op->writeset_out, win32op->writeset_in);

fd_count =
Expand Down Expand Up @@ -343,7 +343,7 @@ win32_dispatch(struct event_base *base, struct timeval *tv)
if (++i >= win32op->exset_out->fd_count)
i = 0;
s = win32op->exset_out->fd_array[i];
evmap_io_active(base, s, EV_READ);
evmap_io_active(base, s, EV_WRITE);
}
}
if (win32op->writeset_out->fd_count) {
Expand Down

0 comments on commit d8164d0

Please sign in to comment.