Ok sure, here it is (attached).
bye,
Saxon
----- Original Message -----
From: "Sander Striker" <[EMAIL PROTECTED]>
To: "Saxon" <[EMAIL PROTECTED]>; <[email protected]>
Sent: Monday, March 25, 2002 4:27 PM
Subject: RE: [Q] apr_poll_revents_get() before apr_accept() on Windows
> > From: Saxon [mailto:[EMAIL PROTECTED]
> > Sent: 25 March 2002 01:25
>
> > Hi,
> >
> > I ran into the same problem a couple of days ago. I modified the
> > implementation of apr_poll_revents_get() to the attached file, to fix
the
> > problem. Basically, if the socket is listening, then the WSARecv isn't
done.
> > Also I added another fix where if the WSARecv returns zero bytes on a
> > stream-type socket, that indicates a graceful shutdown (APR_POLLHUP
instead
> > of APR_POLLIN).
> >
> > I can create a proper diff-style patch for this if people agree it's
> > sensible?
>
> Please _always_ send a unified diff. Full files are hard to review since
> it isn't directly obvious what has changed.
>
> > cya,
> > Saxon
>
> Sander
--- apr/network_io/win32/poll.c.old Mon Mar 25 16:37:46 2002
+++ apr/network_io/win32/poll.c Mon Mar 25 16:38:53 2002
@@ -156,6 +156,9 @@
DWORD dummy;
DWORD flags = MSG_PEEK;
+ BOOL optval;
+ int optlen;
+
/* We just want to PEEK at the data, so I am setting up a dummy WSABUF
* variable here.
*/
@@ -164,27 +167,45 @@
if (FD_ISSET(sock->sock, aprset->read)) {
revents |= APR_POLLIN;
- if (WSARecv(sock->sock, &data, 1, &dummy, &flags, NULL,
- NULL) == SOCKET_ERROR) {
- /* This is only legit since we don't return the error */
- dummy = WSAGetLastError();
- switch (dummy) {
- case WSAECONNRESET:
- case WSAECONNABORTED:
- case WSAESHUTDOWN:
- case WSAENETRESET: {
- revents ^= APR_POLLIN;
- revents |= APR_POLLHUP;
- break;
- }
- case WSAENOTSOCK: {
- revents ^= APR_POLLIN;
- revents |= APR_POLLNVAL;
- }
- default: {
- revents ^= APR_POLLIN;
- revents |= APR_POLLERR;
+
+ /* Check if the socket is listening for a connection (SO_ACCEPTCONN
+ * is true) - if it is we just leave APR_POLLIN in revents and
+ * don't attempt the WSARecv, since it would return WSAENOTCONN.
+ */
+ optlen = sizeof(optval);
+ getsockopt(sock->sock, SOL_SOCKET, SO_ACCEPTCONN, (char *)&optval,
+ &optlen);
+ if (!optval) {
+ /* The socket is not listening */
+ if (WSARecv(sock->sock, &data, 1, &dummy, &flags, NULL,
+ NULL) == SOCKET_ERROR) {
+ /* This is only legit since we don't return the error */
+ dummy = WSAGetLastError();
+ switch (dummy) {
+ case WSAECONNRESET:
+ case WSAECONNABORTED:
+ case WSAESHUTDOWN:
+ case WSAENETRESET: {
+ revents ^= APR_POLLIN;
+ revents |= APR_POLLHUP;
+ break;
+ }
+ case WSAENOTSOCK: {
+ revents ^= APR_POLLIN;
+ revents |= APR_POLLNVAL;
+ }
+ default: {
+ revents ^= APR_POLLIN;
+ revents |= APR_POLLERR;
+ }
}
+ }
+ else if ((dummy == 0) && (sock->type == SOCK_STREAM)) {
+ /* Zero bytes received (dummy is the number of bytes)
+ * from a stream socket indicates graceful shutdown.
+ */
+ revents ^= APR_POLLIN;
+ revents |= APR_POLLHUP;
}
}
}
