You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2023/01/19 16:01:46 UTC
svn commit: r1906806 - in /httpd/httpd/branches/2.4.x: ./ changes-entries/h2-rst-access-500-fix.txt modules/http2/h2_c2_filter.c
Author: icing
Date: Thu Jan 19 16:01:46 2023
New Revision: 1906806
URL: http://svn.apache.org/viewvc?rev=1906806&view=rev
Log:
Merge of r1906775 from trunk:
*) mod_http2: client resets of HTTP/2 streams led to unwanted 500 errors
reported in access logs and error documents. The processing of the
reset was correct, only unneccesary reporting was caused.
Added:
httpd/httpd/branches/2.4.x/changes-entries/h2-rst-access-500-fix.txt
- copied unchanged from r1906775, httpd/httpd/trunk/changes-entries/h2-rst-access-500-fix.txt
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1906775
Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c?rev=1906806&r1=1906805&r2=1906806&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c Thu Jan 19 16:01:46 2023
@@ -615,7 +615,7 @@ apr_status_t h2_c2_filter_catch_h1_out(a
ap_assert(conn_ctx);
H2_FILTER_LOG("c2_catch_h1_out", f->c, APLOG_TRACE2, 0, "check", bb);
- if (!conn_ctx->has_final_response) {
+ if (!f->c->aborted && !conn_ctx->has_final_response) {
if (!parser) {
parser = apr_pcalloc(f->c->pool, sizeof(*parser));
parser->id = apr_psprintf(f->c->pool, "%s-%d", conn_ctx->id, conn_ctx->stream_id);