Fix #2284: Clone web request's state

aiohttp/web_request.py

@@ -62,7 +62,10 @@ class BaseRequest(collections.MutableMapping, HeadersMixin):
 
     def __init__(self, message, payload, protocol, writer, time_service, task,
                  loop,
-                 *, secure_proxy_ssl_header=None, client_max_size=1024**2):
+                 *, secure_proxy_ssl_header=None, client_max_size=1024**2,
+                 state=None):
+        if state is None:
+            state = {}
         self._message = message
         self._protocol = protocol
         self._transport = protocol.transport
@@ -78,7 +81,7 @@ def __init__(self, message, payload, protocol, writer, time_service, task,
 
         self._secure_proxy_ssl_header = secure_proxy_ssl_header
         self._time_service = time_service
-        self._state = {}
+        self._state = state
         self._cache = {}
         self._task = task
         self._client_max_size = client_max_size
@@ -120,7 +123,8 @@ def clone(self, *, method=sentinel, rel_url=sentinel,
             self._time_service,
             self._task,
             self._loop,
-            secure_proxy_ssl_header=self._secure_proxy_ssl_header)
+            secure_proxy_ssl_header=self._secure_proxy_ssl_header,
+            state=self._state.copy())
 
     @property
     def task(self):

changes/2284.bugfix

@@ -0,0 +1 @@
+Properly clone state of web request

tests/test_web_request.py

@@ -620,3 +620,12 @@ def test_remote_peername_forwarded_overrides_x_forwarded():
         headers={'Forwarded': 'for=11.11.11.11, for=12.12.12.12',
                  'X-Forwarded-For': '13.13.13.13'})
     assert req.remote == '11.11.11.11'
+
+
+def test_save_state_on_clone():
+    req = make_mocked_request('GET', '/')
+    req['key'] = 'val'
+    req2 = req.clone()
+    req2['key'] = 'val2'
+    assert req['key'] == 'val'
+    assert req2['key'] == 'val2'