rbb 00/12/30 10:31:37
Modified: . CHANGES
network_io/unix poll.c
Log:
Fix a couple of places where copied code wasn't modified correctly. This
should get the apr_poll functions working better when it is implemented
using select().
PR: 6977
Submitted by: Nick Caruso <[EMAIL PROTECTED]>
Revision Changes Path
1.32 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- CHANGES 2000/12/28 23:14:04 1.31
+++ CHANGES 2000/12/30 18:31:36 1.32
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Fix a logic error in the poll code when implemented using select.
+ [Nick Caruso <[EMAIL PROTECTED]>]
+
*) FreeBSD does not support sendfile() in combination with threads
before version 4.2. We no longer even try to support it.
[Ryan Bloom]
1.42 +3 -3 apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/poll.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- poll.c 2000/12/11 19:39:15 1.41
+++ poll.c 2000/12/30 18:31:36 1.42
@@ -246,7 +246,7 @@
FD_SET(sock->socketdes, aprset->read);
}
if (event & APR_POLLPRI) {
- FD_SET(sock->socketdes, aprset->read);
+ FD_SET(sock->socketdes, aprset->except);
}
if (event & APR_POLLOUT) {
FD_SET(sock->socketdes, aprset->write);
@@ -351,7 +351,7 @@
apr_status_t apr_remove_poll_socket(apr_pollfd_t *aprset, apr_socket_t *sock)
{
FD_CLR(sock->socketdes, aprset->read);
- FD_CLR(sock->socketdes, aprset->read);
+ FD_CLR(sock->socketdes, aprset->except);
FD_CLR(sock->socketdes, aprset->write);
return APR_SUCCESS;
}
@@ -362,7 +362,7 @@
FD_ZERO(aprset->read);
}
if (event & APR_POLLPRI) {
- FD_ZERO(aprset->read);
+ FD_ZERO(aprset->except);
}
if (event & APR_POLLOUT) {
FD_ZERO(aprset->write);
