You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2020/06/20 14:22:18 UTC
svn commit: r1879036 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
modules/http2/h2_task.c
Author: jim
Date: Sat Jun 20 14:22:18 2020
New Revision: 1879036
URL: http://svn.apache.org/viewvc?rev=1879036&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/modules/http2/h2_task.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1876616
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1879036&r1=1879035&r2=1879036&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Jun 20 14:22:18 2020
@@ -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]
Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_task.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_task.c?rev=1879036&r1=1879035&r2=1879036&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_task.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_task.c Sat Jun 20 14:22:18 2020
@@ -585,6 +585,8 @@ apr_status_t h2_task_do(h2_task *task, a
* 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",