Merge r1876616 from trunk:

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

Submitted by: icing
Reviewed by: steffenal, rpluem, gbechis, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879036 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index cdd30ecce57a4cda2c342428d514aed272525890..95dc7be0e29835511134f9ec5dcf6ce9837b986a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ Changes with Apache 2.4.44
 
   *) mod_ssl: Fix memory leak in stapling code. PR63687. [Stefan Eissing]
 
+  *) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
+     PR64330 [Stefan Eissing]
+
   *) mod_http2: Fixed regression that caused connections to close when mod_reqtimeout
      was configured with a handshake timeout. Fixes gitub issue #196.
      [Stefan Eissing]

diff --git a/modules/http2/h2_task.c b/modules/http2/h2_task.c
index d61089577175efe82b95da883c08ddfa59bb3be2..718e20b3532da7b10e0d1d10f905954c9da5c00a 100644 (file)
--- a/modules/http2/h2_task.c
+++ b/modules/http2/h2_task.c
@@ -585,6 +585,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",