adding in enforce_content_length=True default and test

psf · Sep 8, 2016 · d356e0e · d356e0e
1 parent b2f6173
commit d356e0e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/requests/adapters.py b/requests/adapters.py
@@ -420,7 +420,8 @@ def send(self, request, stream=False, timeout=None, verify=True, cert=None, prox
                     preload_content=False,
                     decode_content=False,
                     retries=self.max_retries,
-                    timeout=timeout
+                    timeout=timeout,
+                    enforce_content_length=True
                 )
 
             # Send the request.
@@ -464,7 +465,9 @@ def send(self, request, stream=False, timeout=None, verify=True, cert=None, prox
                         pool=conn,
                         connection=low_conn,
                         preload_content=False,
-                        decode_content=False
+                        decode_content=False,
+                        enforce_content_length=True,
+                        request_method=request.method
                     )
                 except:
                     # If we hit any problems here, clean up the connection.

diff --git a/tests/test_requests.py b/tests/test_requests.py
@@ -113,6 +113,16 @@ def test_override_content_length(self, httpbin):
         assert 'Content-Length' in r.headers
         assert r.headers['Content-Length'] == 'not zero'
 
+    @pytest.mark.skip(reason='Can\'t test till urllib3 1.17 is merged.')
+    def test_incorrect_content_length(self, httpbin):
+        from requests.packages.urllib3.exceptions import IncompleteRead
+        params = {'Content-Length': 300}
+        r = requests.Request('GET', httpbin('response-headers')).prepare()
+        s = requests.Sesssion()
+        with pytest.raises(IncompleteRead):
+            resp = s.send(r)
+        assert s.send(r, enforce_content_length=False) is not None
+
     def test_path_is_not_double_encoded(self):
         request = requests.Request('GET', "http://0.0.0.0/get/test case").prepare()