From fcb2977192989cfac5ec864e3f9a4083d3e6e4c4 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Wed, 20 Jan 2016 13:45:31 +0000 Subject: [PATCH] updating scoreboard from conn to erase request string whenever appropriate git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725721 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/h2_conn_io.c | 2 +- modules/http2/h2_session.c | 4 ++-- modules/http2/h2_task.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/http2/h2_conn_io.c b/modules/http2/h2_conn_io.c index 1ac1edc666..ed31352d3d 100644 --- a/modules/http2/h2_conn_io.c +++ b/modules/http2/h2_conn_io.c @@ -109,7 +109,7 @@ static apr_status_t pass_out(apr_bucket_brigade *bb, void *ctx) return APR_SUCCESS; } - ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, NULL); + ap_update_child_status_from_conn(c->sbh, SERVER_BUSY_WRITE, c); status = apr_brigade_length(bb, 0, &bblen); if (status == APR_SUCCESS) { ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03044) diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index 94f637d2c1..3a404eff75 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -2003,7 +2003,7 @@ apr_status_t h2_session_process(h2_session *session, int async) * avoid that... */ h2_filter_cin_timeout_set(session->cin, session->keepalive_secs); - ap_update_child_status(c->sbh, SERVER_BUSY_KEEPALIVE, NULL); + ap_update_child_status_from_conn(c->sbh, SERVER_BUSY_KEEPALIVE, c); status = h2_session_read(session, 1, 10); if (status == APR_SUCCESS) { have_read = 1; @@ -2024,7 +2024,7 @@ apr_status_t h2_session_process(h2_session *session, int async) case H2_SESSION_ST_LOCAL_SHUTDOWN: case H2_SESSION_ST_REMOTE_SHUTDOWN: if (nghttp2_session_want_read(session->ngh2)) { - ap_update_child_status(c->sbh, SERVER_BUSY_READ, NULL); + ap_update_child_status_from_conn(c->sbh, SERVER_BUSY_READ, c); h2_filter_cin_timeout_set(session->cin, session->timeout_secs); status = h2_session_read(session, 0, 10); if (status == APR_SUCCESS) { diff --git a/modules/http2/h2_task.c b/modules/http2/h2_task.c index 9525cc15ed..510c399730 100644 --- a/modules/http2/h2_task.c +++ b/modules/http2/h2_task.c @@ -220,7 +220,7 @@ static apr_status_t h2_task_process_request(const h2_request *req, conn_rec *c) cs->state = CONN_STATE_WRITE_COMPLETION; r = NULL; } - ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, NULL); + ap_update_child_status_from_conn(c->sbh, SERVER_BUSY_WRITE, c); c->sbh = NULL; return APR_SUCCESS; -- 2.40.0