diff options
| -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): |