*) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.

     PR64330

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876616 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index cdda0681cab071b167be1a67e20824aa01209a81..53a0f8e5a030aef4ced832ac5ca2b2641422dfc9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
+     PR64330 [Stefan Eissing]
+
   *) htcacheclean: Empty directories in CacheRoot are still present even after
      using "-t". PR64313 [Petros Marios Prokopiou <pprokopi redhat.com>,
      Ruediger Pluem, Jean-Frederic Clere]

diff --git a/modules/http2/h2_task.c b/modules/http2/h2_task.c
index c3bf6a6db0e3f9c959903ec642d0dec27cc9acb4..a0b22a35a14b09986ab098d814143dc7269a230b 100644 (file)
--- a/modules/http2/h2_task.c
+++ b/modules/http2/h2_task.c
@@ -586,6 +586,8 @@ apr_status_t h2_task_do(h2_task *task, apr_thread_t *thread, int worker_id)
          * configurations by mod_h2 alone. 
          */
         task->c->id = (c->master->id << 8)^worker_id;
+        task->id = apr_psprintf(task->pool, "%ld-%d", c->master->id, 
+                                task->stream_id);
     }
         
     h2_beam_create(&task->output.beam, c->pool, task->stream_id, "output",