From: Paul Querna <pquerna@apache.org>
Date: Mon, 3 Nov 2008 17:41:00 +0000 (+0000)
Subject: Make sure we clear out previous things we were listening for.
X-Git-Tag: 2.3.0~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beacc171b73e2a2c0e358a529891e4e8268c1d8f;p=thirdparty%2Fapache%2Fhttpd.git

Make sure we clear out previous things we were listening for.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@710111 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/simple/simple_io.c b/server/mpm/simple/simple_io.c
index 0759c916123..8774ed323e8 100644
--- a/server/mpm/simple/simple_io.c
+++ b/server/mpm/simple/simple_io.c
@@ -64,6 +64,15 @@ static apr_status_t simple_io_process(simple_conn_t * scon)
     cs = c->cs;
 
     while (!c->aborted) {
+
+        cs->pfd.reqevents = APR_POLLOUT | APR_POLLHUP | APR_POLLERR | APR_POLLIN;
+        rv = apr_pollcb_remove(sc->pollcb, &cs->pfd);
+        if (rv) {
+            ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf,
+                         "process_socket: apr_pollset_remove failure");
+            /*AP_DEBUG_ASSERT(rv == APR_SUCCESS);*/
+        }
+        
         if (cs->state == CONN_STATE_READ_REQUEST_LINE) {
             if (!c->aborted) {
                 ap_run_process_connection(c);