From: Stefan Eissing <icing@apache.org>
Date: Thu, 16 Apr 2020 17:15:40 +0000 (+0000)
Subject:   *) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1517
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73376148af245b520f12fdf119da8caa2154e2f3;p=thirdparty%2Fapache%2Fhttpd.git

  *) 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 cdda0681cab..53a0f8e5a03 100644
--- 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 c3bf6a6db0e..a0b22a35a14 100644
--- 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",