From: Stefan Eissing <icing@apache.org>
Date: Thu, 14 Oct 2021 15:26:59 +0000 (+0000)
Subject:   * mod_http2: hopeful (as always) fix for the stalling in 400_20.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~731
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a303fdb6f0d938eccfa7a6e7811d08bd2432d4a;p=thirdparty%2Fapache%2Fhttpd.git

  * mod_http2: hopeful (as always) fix for the stalling in 400_20.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894252 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c
index ef9e88fffc9..b29a7d57afd 100644
--- a/modules/http2/h2_stream.c
+++ b/modules/http2/h2_stream.c
@@ -999,6 +999,7 @@ static apr_status_t buffer_output_process_headers(h2_stream *stream)
             && !h2_config_sgeti(stream->session->s, H2_CONF_EARLY_HINTS)) {
             /* suppress sending this to the client, it might have triggered
              * pushes and served its purpose nevertheless */
+            rv = APR_SUCCESS;
             goto cleanup;
         }
         if (h2_headers_are_final_response(headers)) {
diff --git a/test/modules/http2/test_400_push.py b/test/modules/http2/test_400_push.py
index df3062953af..d3c21c4f958 100644
--- a/test/modules/http2/test_400_push.py
+++ b/test/modules/http2/test_400_push.py
@@ -140,7 +140,6 @@ class TestStore:
         assert 0 == len(promises)
 
     # 2 H2PushResource config trigger on GET, but not on POST
-    @pytest.mark.skip(reason="FIXME: this fails on travis")
     def test_h2_400_20(self, env, repeat):
         url = env.mkurl("https", "push", "/006-push20.html")
         r = env.nghttp().get(url)