Clear and restore sbh in notify_suspend() and notify_resume() respectively.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1663017 13f79535-47bb-0310-9956-
ffa450edef68
{
ap_run_suspend_connection(cs->c, cs->r);
cs->suspended = 1;
{
ap_run_suspend_connection(cs->c, cs->r);
cs->suspended = 1;
-static void notify_resume(event_conn_state_t *cs)
+static void notify_resume(event_conn_state_t *cs, ap_sb_handle_t *sbh)
cs->suspended = 0;
ap_run_resume_connection(cs->c, cs->r);
}
cs->suspended = 0;
ap_run_resume_connection(cs->c, cs->r);
}
cs->pub.state = CONN_STATE_LINGER_NORMAL;
}
apr_atomic_inc32(&lingering_count);
cs->pub.state = CONN_STATE_LINGER_NORMAL;
}
apr_atomic_inc32(&lingering_count);
if (in_worker) {
notify_suspend(cs);
}
if (in_worker) {
notify_suspend(cs);
}
+ else {
+ cs->c->sbh = NULL;
+ }
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(*q, cs);
cs->pfd.reqevents = (
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(*q, cs);
cs->pfd.reqevents = (
static int start_lingering_close_blocking(event_conn_state_t *cs)
{
if (ap_start_lingering_close(cs->c)) {
static int start_lingering_close_blocking(event_conn_state_t *cs)
{
if (ap_start_lingering_close(cs->c)) {
notify_suspend(cs);
ap_push_pool(worker_queue_info, cs->p);
return 0;
notify_suspend(cs);
ap_push_pool(worker_queue_info, cs->p);
return 0;
event_conn_state_t *cs = dummy;
if (cs->suspended) {
event_conn_state_t *cs = dummy;
if (cs->suspended) {
+ notify_resume(cs, NULL);
- c->sbh = sbh;
- notify_resume(cs);
+ notify_resume(cs, sbh);
c->current_thread = thd;
/* Subsequent request on a conn, and thread number is part of ID */
c->id = conn_id;
c->current_thread = thd;
/* Subsequent request on a conn, and thread number is part of ID */
c->id = conn_id;
* event thread poll for writeability.
*/
cs->expiration_time = ap_server_conf->timeout + apr_time_now();
* event thread poll for writeability.
*/
cs->expiration_time = ap_server_conf->timeout + apr_time_now();
notify_suspend(cs);
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(write_completion_q, cs);
notify_suspend(cs);
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(write_completion_q, cs);
*/
cs->expiration_time = ap_server_conf->keep_alive_timeout +
apr_time_now();
*/
cs->expiration_time = ap_server_conf->keep_alive_timeout +
apr_time_now();
notify_suspend(cs);
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(keepalive_q, cs);
notify_suspend(cs);
apr_thread_mutex_lock(timeout_mutex);
TO_QUEUE_APPEND(keepalive_q, cs);
else if (cs->pub.state == CONN_STATE_SUSPENDED) {
cs->c->suspended_baton = cs;
apr_atomic_inc32(&suspended_count);
else if (cs->pub.state == CONN_STATE_SUSPENDED) {
cs->c->suspended_baton = cs;
apr_atomic_inc32(&suspended_count);