Skip to content

Commit

Permalink
event: follow up to r1593860.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ylavic committed Sep 27, 2016
1 parent dc83792 commit f91c6d6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion server/mpm/event/event.c
Expand Up @@ -1212,7 +1212,8 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc
}

/* 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)
Expand All @@ -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 = (
Expand Down

0 comments on commit f91c6d6

Please sign in to comment.