[serf] r1566 committed - Merge r1565 into the 1.0.x branch.

[se...@googlecode.com]

Revision: 1566
Author: st...@elego.de
Date: Wed Feb 15 12:16:09 2012
Log: Merge r1565 into the 1.0.x branch.

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

Modified:
/branches/1.0.x
/branches/1.0.x/test/server/test_server.c

=======================================
--- /branches/1.0.x/test/server/test_server.c Sun Oct 9 11:35:30 2011
+++ /branches/1.0.x/test/server/test_server.c Wed Feb 15 12:16:09 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);