www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

followup to r1604350, move the c->sbh assignment to immediately before the

Browse Source 
socket is added to the timeout queue. Technically not needed because we hold
the lock on the timeout queue, but more consistent with other blocks that
leave the thread.


Submitted By: Edward Lu <Chaosed0 gmail com>
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1605067 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2014-06-24 12:34:52 +00:00
parent 303f962ea6
commit 9be0156800
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/mpm/event/event.c
View File

@@ -840,12 +840,12 @@ static int start_lingering_close_common(event_conn_state_t *cs)
}
apr_atomic_inc32(&lingering_count);
apr_thread_mutex_lock(timeout_mutex);
cs->c->sbh = NULL;
TO_QUEUE_APPEND(*q, cs);
cs->pfd.reqevents = (
cs->pub.sense == CONN_SENSE_WANT_WRITE ? APR_POLLOUT :
APR_POLLIN) | APR_POLLHUP | APR_POLLERR;
cs->pub.sense = CONN_SENSE_DEFAULT;
cs->c->sbh = NULL;
rv = apr_pollset_add(event_pollset, &cs->pfd);
apr_thread_mutex_unlock(timeout_mutex);
if (rv != APR_SUCCESS && !APR_STATUS_IS_EEXIST(rv)) {