*) mod_http2: make test_h2_200_17+18 work reliably with

    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

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 7c73e230699b564b4024050e1529c35c399e2719..7fa0376043a89ffe2181c741ebb3fe10479ddd00 100644 (file)
--- 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 cbc4b6c9fa8721b873039553b54d0413487abb55..6b73301c282f0db0d834a3e31662b3542ad35d1e 100644 (file)
--- 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):