Merge branch 'master' of github.com:KeepSafe/aiohttp

Author: asvetlov

aiohttp/server.py

@@ -89,6 +89,10 @@ def __init__(self, *, loop=None, keep_alive=None,
         self.access_log = access_log
         self.access_log_format = access_log_format
 
+    @property
+    def keep_alive_timeout(self):
+        return self._keep_alive_period
+
     def closing(self):
         """Worker process is about to exit, we need cleanup everything and
         stop accepting requests. It is especially important for keep-alive

aiohttp/web.py

@@ -131,7 +131,8 @@ def content_length(self):
 
 class Request(HeadersMixin):
 
-    def __init__(self, app, message, payload, transport, writer):
+    def __init__(self, app, message, payload, transport, writer,
+                 keep_alive_timeout):
         self._app = app
         self._version = message.version
         self._transport = transport
@@ -154,7 +155,7 @@ def __init__(self, app, message, payload, transport, writer):
         elif message.should_close:
             self._keep_alive = False
         else:
-            self._keep_alive = True
+            self._keep_alive = bool(keep_alive_timeout)
 
         # matchdict, route_name, handler
         # or information about traversal lookup
@@ -967,7 +968,7 @@ def __init__(self, app, **kwargs):
     @asyncio.coroutine
     def handle_request(self, message, payload):
         request = Request(self._app, message, payload,
-                          self.transport, self.writer)
+                          self.transport, self.writer, self.keep_alive_timeout)
         try:
             match_info = yield from self._app.router.resolve(request)
 

tests/test_urldispatch.py

@@ -17,16 +17,15 @@ def setUp(self):
     def tearDown(self):
         self.loop.close()
 
-    def make_request(self, method, path, headers=MultiDict(), *,
-                     version=HttpVersion(1, 1), closing=False):
+    def make_request(self, method, path):
         self.app = mock.Mock()
-        message = RawRequestMessage(method, path, version, headers, closing,
-                                    False)
+        message = RawRequestMessage(method, path, HttpVersion(1, 1),
+                                    MultiDict(), False, False)
         self.payload = mock.Mock()
         self.transport = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.writer)
+                      self.transport, self.writer, 15)
         return req
 
     def test_add_route_root(self):

tests/test_web_exceptions.py

@@ -34,7 +34,7 @@ def make_request(self, method='GET', path='/', headers=MultiDict()):
         message = RawRequestMessage(method, path, HttpVersion11, headers,
                                     False, False)
         req = Request(self.app, message, self.payload,
-                      self.transport, self.writer)
+                      self.transport, self.writer, 15)
         return req
 
     def test_all_http_exceptions_exported(self):

tests/test_web_request.py

@@ -17,15 +17,16 @@ def tearDown(self):
         self.loop.close()
 
     def make_request(self, method, path, headers=MultiDict(), *,
-                     version=HttpVersion(1, 1), closing=False):
+                     version=HttpVersion(1, 1), closing=False,
+                     keep_alive_timeout=15):
         self.app = mock.Mock()
         message = RawRequestMessage(method, path, version, headers, closing,
                                     False)
         self.payload = mock.Mock()
         self.transport = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.writer)
+                      self.transport, self.writer, keep_alive_timeout)
         return req
 
     def test_ctor(self):
@@ -96,6 +97,10 @@ def test_non_keepalive_on_closing(self):
         req = self.make_request('GET', '/', closing=True)
         self.assertFalse(req.keep_alive)
 
+    def test_non_keepalive_on_server_protocol_without_keepalive_timeout(self):
+        req = self.make_request('GET', '/', closing=True, keep_alive_timeout=0)
+        self.assertFalse(req.keep_alive)
+
     def test_call_POST_on_GET_request(self):
         req = self.make_request('GET', '/')
 

tests/test_web_response.py

@@ -23,7 +23,7 @@ def make_request(self, method, path, headers=MultiDict()):
         self.transport = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.writer)
+                      self.transport, self.writer, 15)
         return req
 
     def test_ctor(self):
@@ -292,7 +292,7 @@ def make_request(self, method, path, headers=MultiDict()):
         self.transport = mock.Mock()
         self.writer = mock.Mock()
         req = Request(self.app, message, self.payload,
-                      self.transport, self.writer)
+                      self.transport, self.writer, 15)
         return req
 
     def test_ctor(self):