Merge pull request #3003 from jasonamyers/2977-content-length

Updating Content-Length Handling

gunicorn/http/message.py

@@ -139,7 +139,10 @@ class Message(object):
             self.body = Body(ChunkedReader(self, self.unreader))
         elif content_length is not None:
             try:
-                content_length = int(content_length)
+                if str(content_length).isnumeric():
+                    content_length = int(content_length)
+                else:
+                    raise InvalidHeader("CONTENT-LENGTH", req=self)
             except ValueError:
                 raise InvalidHeader("CONTENT-LENGTH", req=self)
 

tests/requests/invalid/022.http

@@ -0,0 +1,3 @@
+GET /first HTTP/1.0\r\n
+Content-Length: -0\r\n
+\r\n

tests/requests/invalid/022.py

@@ -0,0 +1,5 @@
+from gunicorn.config import Config
+from gunicorn.http.errors import InvalidHeader
+
+cfg = Config()
+request = InvalidHeader

tests/requests/invalid/023.http

@@ -0,0 +1,3 @@
+GET /first HTTP/1.0\r\n
+Content-Length: 0_1\r\n
+\r\n

tests/requests/invalid/023.py

@@ -0,0 +1,5 @@
+from gunicorn.config import Config
+from gunicorn.http.errors import InvalidHeader
+
+cfg = Config()
+request = InvalidHeader

tests/requests/invalid/024.http

@@ -0,0 +1,3 @@
+GET /first HTTP/1.0\r\n
+Content-Length: +1\r\n
+\r\n

tests/requests/invalid/024.py

@@ -0,0 +1,5 @@
+from gunicorn.config import Config
+from gunicorn.http.errors import InvalidHeader
+
+cfg = Config()
+request = InvalidHeader