rbb 01/10/02 11:51:17
Modified: . CHANGES
network_io/unix poll.c
Log:
Fix a segfault in apr_poll_clear on Unix. Also fix the logic
for the case where there are multiple events ORed together in
the events list.
Submitted by: Jamshid Mahdavi <[EMAIL PROTECTED]>
Revision Changes Path
1.166 +4 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- CHANGES 2001/10/01 19:12:49 1.165
+++ CHANGES 2001/10/02 18:51:17 1.166
@@ -1,5 +1,9 @@
Changes with APR b1
+ *) Fix a segfault in apr_poll_clear on Unix. Also fix the logic
+ for the case where there are multiple events ORed together in
+ the events list. [Jamshid Mahdavi <[EMAIL PROTECTED]>]
+
*) Files opened on Unix with the flag APR_DELONCLOSE are now
not unlinked until they are actually closed, rather than as
soon as they're opened. The old approach worked but made
1.49 +2 -2 apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/poll.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- poll.c 2001/07/23 17:58:08 1.48
+++ poll.c 2001/10/02 18:51:17 1.49
@@ -212,8 +212,8 @@
newevents = get_event(events);
while (i < aprset->curpos) {
- if (aprset->events[i] & newevents) {
- aprset->events[i] ^= newevents;
+ if (aprset->pollset[i].events & newevents) {
+ aprset->pollset[i].events &= ~newevents;
}
i++;
}
