Merge branch 'development' into override-default-headers

Author: irvind

hyper/http20/connection.py

@@ -513,7 +513,7 @@ def _new_stream(self, stream_id=None, local_closed=False):
         s = Stream(
             stream_id or self.next_stream_id, self._send_cb, self._recv_cb,
             self._close_stream, self.encoder, self.decoder,
-            self.__wm_class(65535), local_closed
+            self.__wm_class(window_size), local_closed
         )
         s._out_flow_control_window = self._out_flow_control_window
         self.streams[s.stream_id] = s
@@ -725,6 +725,8 @@ def _recv_cb(self):
             except ConnectionResetError:
                 break
 
+            count -= 1
+
     def _send_rst_frame(self, stream_id, error_code):
         """
         Send reset stream frame with error code and remove stream from map.

test/test_hyper.py

@@ -554,6 +554,23 @@ def test_that_using_proxy_keeps_http_headers_intact(self):
             (b':path', b'/'),
         ]
 
+    def test_recv_cb_n_times(self):
+        sock = DummySocket()
+        sock.can_read = True
+
+        c = HTTP20Connection('www.google.com')
+        c._sock = sock
+
+        mutable = {'counter': 0}
+
+        def consume_single_frame():
+            mutable['counter'] += 1
+            
+        c._consume_single_frame = consume_single_frame
+        c._recv_cb()
+
+        assert mutable['counter'] == 10
+
 
 class TestServerPush(object):
     def setup_method(self, method):