summaryrefslogtreecommitdiffstats
path: root/server/mpm/motorz/motorz.c
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2016-02-15 20:48:51 +0100
committerJim Jagielski <jim@apache.org>2016-02-15 20:48:51 +0100
commitce530736804fec76186dec2ccaa9101bde17ebcd (patch)
tree7a03f250a69c70aed511352beee88494a4deca12 /server/mpm/motorz/motorz.c
parentUpdate the motorz MPM with some logging and some minor fixes... (diff)
downloadapache2-ce530736804fec76186dec2ccaa9101bde17ebcd.tar.xz
apache2-ce530736804fec76186dec2ccaa9101bde17ebcd.zip
start of timeout handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730600 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/motorz/motorz.c')
-rw-r--r--server/mpm/motorz/motorz.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c
index d8fc533ff4..1ade2cb938 100644
--- a/server/mpm/motorz/motorz.c
+++ b/server/mpm/motorz/motorz.c
@@ -110,16 +110,13 @@ motorz_get_keep_alive_timeout(motorz_conn_t *scon)
}
}
-static void motorz_io_timeout_cb(motorz_core_t * sc, void *baton)
+static void motorz_io_timeout_cb(motorz_core_t *mz, void *baton)
{
- /* Code disabled because it does nothing yet but causes a compiler warning */
-#if 0
- motorz_conn_t *mzon = (motorz_conn_t *) baton;
- /* pqXXXXX: handle timeouts. */
- conn_rec *c = scon->c;
- cs = NULL;
-#endif
+ motorz_conn_t *scon = (motorz_conn_t *) baton;
+ conn_rec *c = scon->c;
+ scon->cs.state = CONN_STATE_LINGER;
+ ap_lingering_close(c);
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO(02842)
"io timeout hit (?)");