Merge of PR 301

    fix setting of initial connection window size

    The code for setting the connection initial window size was wrong.

    refs #300

Author: icing

ChangeLog

@@ -1,3 +1,6 @@
+  * The connection window size was set wrong, preventing `H2WindowSize`
+    to work. Fixed #300.
+
 v2.0.31
 --------------------------------------------------------------------------------
   * mod_proxy_http2: revert r1912193 for detecting broken backend connections

mod_http2/h2_session.c

@@ -1154,13 +1154,13 @@ static apr_status_t h2_session_start(h2_session *session, int *rv)
          * interim updates, any smaller connection window will lead to blocking
          * in DATA flow.
          */
-        *rv = nghttp2_submit_window_update(session->ngh2, NGHTTP2_FLAG_NONE,
-                                           0, NGHTTP2_MAX_WINDOW_SIZE - win_size);
+        *rv = nghttp2_session_set_local_window_size(
+            session->ngh2, NGHTTP2_FLAG_NONE, 0, NGHTTP2_MAX_WINDOW_SIZE);
         if (*rv != 0) {
             status = APR_EGENERAL;
             ap_log_cerror(APLOG_MARK, APLOG_ERR, status, session->c1,
                           H2_SSSN_LOG(APLOGNO(02970), session,
-                          "nghttp2_submit_window_update: %s"), 
+                          "nghttp2_session_set_local_window_size: %s"),
                           nghttp2_strerror(*rv));        
         }
     }

test/modules/http2/test_106_shutdown.py

@@ -66,7 +66,7 @@ def test_h2_106_02(self, env):
             r = env.curl_get(url, options=['-v'])
             # requests should succeed, but rarely connections get closed
             # before the response is received
-            if r.exit_code in [16, 55]:
+            if r.exit_code in [16, 55, 56]:
                 # curl send error
                 assert r.response is None
             else:

test/modules/http2/test_107_frame_lengths.py

@@ -49,3 +49,21 @@ def test_h2_107_01(self, env, data_frame_len):
             assert len(r.results["data_lengths"]) > 0, f'{r}'
             too_large = [ x for x in r.results["data_lengths"] if x > data_frame_len]
             assert len(too_large) == 0, f'{p}: {r.results["data_lengths"]}'
+
+    @pytest.mark.parametrize("win_size", [
+        32*1024, 10*1024, 1024
+    ])
+    def test_h2_107_02_win_size(self, env, win_size):
+        conf = H2Conf(env, extras={
+            f'cgi.{env.http_tld}': [
+                f'H2WindowSize {win_size}',
+            ]
+        })
+        conf.add_vhost_cgi()
+        conf.install()
+        assert env.apache_restart() == 0
+        url = env.mkurl("https", "cgi", self.URI_PATHS[0])
+        r = env.nghttp().get(url, options=[
+            '--header=Accept-Encoding: none',
+        ])
+        assert r.response["status"] == 200