From: Jim Jagielski <jim@apache.org>
Date: Sat, 20 Jun 2020 14:22:18 +0000 (+0000)
Subject: Merge r1876616 from trunk:
X-Git-Tag: 2.4.44~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a900682d91b5851ea12afd5adecbfd7f17a1a09e;p=thirdparty%2Fapache%2Fhttpd.git

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 cdd30ecce57..95dc7be0e29 100644
--- 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 d6108957717..718e20b3532 100644
--- 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",