[serf] r1565 committed - Revert r1520. It was supposed to fix a problem with FreeBSD kqueue....

0 views
Skip to first unread message

se...@googlecode.com

unread,
Feb 15, 2012, 3:10:08 PM2/15/12
to serf...@googlegroups.com
Revision: 1565
Author: st...@elego.de
Date: Wed Feb 15 12:09:22 2012
Log: Revert r1520. It was supposed to fix a problem with FreeBSD
kqueue.
But Michael Diers and myself found that backing it out is required
to get tests running on FreeBSD 9 and Debian/kFreeBSD wheezy.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621692#77

http://code.google.com/p/serf/source/detail?r=1565

Modified:
/trunk/test/server/test_server.c

=======================================
--- /trunk/test/server/test_server.c Thu Aug 18 10:42:48 2011
+++ /trunk/test/server/test_server.c Wed Feb 15 12:09:22 2012
@@ -217,7 +217,6 @@
apr_pollset_t *pollset;
apr_int32_t num;
const apr_pollfd_t *desc;
- int client_sock_handled = 0;

/* create a new pollset */
status = apr_pollset_create(&pollset, 32, pool, 0);
@@ -261,14 +260,7 @@
goto cleanup;
}

- if (desc->desc.s == servctx->client_sock && !client_sock_handled) {
- /* Note: on some implementations (for example with kqueue),
- apr_pollset_poll() returns separate events for APR_POLLIN
- and APR_POLLOUT. client_sock_handled filters the second
- event.
- */
- client_sock_handled = 1;
-
+ if (desc->desc.s == servctx->client_sock) {
/* Replay data to socket. */
status = replay(servctx, desc->rtnevents, pool);

Reply all
Reply to author
Forward
0 new messages