summaryrefslogtreecommitdiffstats
path: root/modules/http2/h2_workers.c
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2015-11-16 18:29:30 +0100
committerStefan Eissing <icing@apache.org>2015-11-16 18:29:30 +0100
commit181e0dbc89e393957c96a6c3e8d6f5f2f4571988 (patch)
tree3ad84518aa23535ef5d5eee133627bd1804525a9 /modules/http2/h2_workers.c
parentimprovements in handling orphaned stream resources, where client prematurely ... (diff)
downloadapache2-181e0dbc89e393957c96a6c3e8d6f5f2f4571988.tar.xz
apache2-181e0dbc89e393957c96a6c3e8d6f5f2f4571988.zip
task creation moved into h2_worker domain (pool+thread)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1714635 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/h2_workers.c')
-rw-r--r--modules/http2/h2_workers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/http2/h2_workers.c b/modules/http2/h2_workers.c
index bebbcd2d29..3c08ff35d1 100644
--- a/modules/http2/h2_workers.c
+++ b/modules/http2/h2_workers.c
@@ -79,7 +79,7 @@ static apr_status_t get_mplx_next(h2_worker *worker, h2_mplx **pm,
if (*pm && ptask != NULL) {
/* We have a h2_mplx instance and the worker wants the next task.
* Try to get one from the given mplx. */
- *ptask = h2_mplx_pop_task(*pm, &has_more);
+ *ptask = h2_mplx_pop_task(*pm, worker, &has_more);
if (*ptask) {
return APR_SUCCESS;
}
@@ -124,7 +124,7 @@ static apr_status_t get_mplx_next(h2_worker *worker, h2_mplx **pm,
m = H2_MPLX_LIST_FIRST(&workers->mplxs);
H2_MPLX_REMOVE(m);
- task = h2_mplx_pop_task(m, &has_more);
+ task = h2_mplx_pop_task(m, worker, &has_more);
if (task) {
if (has_more) {
H2_MPLX_LIST_INSERT_TAIL(&workers->mplxs, m);