diff options
| author | Stefan Eissing <icing@apache.org> | 2025-01-17 17:12:28 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2025-01-17 17:12:28 +0100 |
| commit | 49c2ee218f8fcaf21989955f151cc11324a863ba (patch) | |
| tree | bb73ef41ec0052132b7bbd0193a686631612082f | |
| parent | *) mod_md: update to version 2.4.31 (diff) | |
| download | apache2-trunk.tar.xz apache2-trunk.zip | |
older and newer curl versions. Only a change in logging,
no function module change.
Newer curl send a GOAWAY on connection shutdown which
triggers another code path that the test did not expect.
Thanks to Rainer Jung for tracking this down.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1923187 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/http2/h2_session.c | 6 | ||||
| -rw-r--r-- | test/modules/http2/test_200_header_invalid.py | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c index 7c73e23069..7fa0376043 100644 --- a/modules/http2/h2_session.c +++ b/modules/http2/h2_session.c @@ -363,9 +363,11 @@ static int on_frame_recv_cb(nghttp2_session *ng2s, else { ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c1, H2_SSSN_LOG(APLOGNO(03066), session, - "recv FRAME[%s], frames=%ld/%ld (r/s)"), + "recv FRAME[%s], frames=%ld/%ld (r/s), " + "remote.emitted=%d"), buffer, (long)session->frames_received, - (long)session->frames_sent); + (long)session->frames_sent, + (int)session->remote.emitted_count); } } diff --git a/test/modules/http2/test_200_header_invalid.py b/test/modules/http2/test_200_header_invalid.py index cbc4b6c9fa..6b73301c28 100644 --- a/test/modules/http2/test_200_header_invalid.py +++ b/test/modules/http2/test_200_header_invalid.py @@ -243,7 +243,8 @@ class TestInvalidHeaders: conf.add_vhost_cgi() conf.install() assert env.apache_restart() == 0 - re_emitted = re.compile(r'.* AH03401: .* shutdown, remote.emitted=1') + re_emitted = re.compile(r'.* (AH03401: .* shutdown,|' + r'AH03066: .* FRAME\[GOAWAY.*) remote.emitted=1') url = env.mkurl("https", "cgi", "/") opt = [] for i in range(10): @@ -263,7 +264,8 @@ class TestInvalidHeaders: conf.add_vhost_cgi() conf.install() assert env.apache_restart() == 0 - re_emitted = re.compile(r'.* AH03401: .* shutdown, remote.emitted=1') + re_emitted = re.compile(r'.* (AH03401: .* shutdown,|' + r'AH03066: .* FRAME\[GOAWAY.*) remote.emitted=1') url = env.mkurl("https", "cgi", "/") opt = [] for i in range(100): |