*) mod_http2: fix test_h2_200_17+18 for newer curl versions. Just add log

   output and add to test checks. No functional change.

Merges r1923187 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923238 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 0efa26b2c6ad3fc2f16f2a14b3eaa3aa674c4c90..680787005bda581f154653d0e153ae4b680afa53 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -157,10 +157,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_http2: fix test_h2_200_17+18 for newer curl versions. Just add log
-     output and add to test checks. No functional change.
-     2.4.x patch: svn merge -c 1923187 ^/httpd/httpd/trunk .
-     +1: icing, jim, rjung
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

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