httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1730600 - /httpd/httpd/trunk/server/mpm/motorz/motorz.c
Date Mon, 15 Feb 2016 19:48:51 GMT
Author: jim
Date: Mon Feb 15 19:48:51 2016
New Revision: 1730600

URL: http://svn.apache.org/viewvc?rev=1730600&view=rev
Log:
start of timeout handling

Modified:
    httpd/httpd/trunk/server/mpm/motorz/motorz.c

Modified: httpd/httpd/trunk/server/mpm/motorz/motorz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/motorz.c?rev=1730600&r1=1730599&r2=1730600&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/motorz.c (original)
+++ httpd/httpd/trunk/server/mpm/motorz/motorz.c Mon Feb 15 19:48:51 2016
@@ -110,16 +110,13 @@ motorz_get_keep_alive_timeout(motorz_con
     }
 }
 
-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 (?)");



Mime
View raw message