]> granicus.if.org Git - apache/commitdiff
event: follow up to r1593860.
authorYann Ylavic <ylavic@apache.org>
Tue, 27 Sep 2016 21:33:02 +0000 (21:33 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 27 Sep 2016 21:33:02 +0000 (21:33 +0000)
Set timestamp before enqueing the timer on resume.

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

server/mpm/event/event.c

index 54bfa9a3384001662c850f70083e50df5d2acfcd..22fe7d248354d5e31dc4a850f03cccfdc1a22a9e 100644 (file)
@@ -1212,7 +1212,8 @@ read_request:
 }
 
 /* Put a SUSPENDED connection back into a queue. */
-static apr_status_t event_resume_suspended (conn_rec *c) {
+static apr_status_t event_resume_suspended (conn_rec *c)
+{
     event_conn_state_t* cs = (event_conn_state_t*) c->suspended_baton;
     if (cs == NULL) {
         ap_log_cerror (APLOG_MARK, LOG_WARNING, 0, c, APLOGNO(02615)
@@ -1226,6 +1227,7 @@ static apr_status_t event_resume_suspended (conn_rec *c) {
     apr_atomic_dec32(&suspended_count);
     c->suspended_baton = NULL;
 
+    cs->queue_timestamp = apr_time_now();
     apr_thread_mutex_lock(timeout_mutex);
     TO_QUEUE_APPEND(cs->sc->wc_q, cs);
     cs->pfd.reqevents = (