Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14602 -- Added an extra check to wsgi.input handling to preven…

…t AppEngine from choking. Thanks to Waldemar Kornewald for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c906b270f5bc53d9657c5f0bdb98a3015c9f8c71 1 parent 05db03c
@freakboy3742 freakboy3742 authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 django/core/handlers/wsgi.py
View
5 django/core/handlers/wsgi.py
@@ -134,7 +134,7 @@ def __init__(self, environ):
self.META['SCRIPT_NAME'] = script_name
self.method = environ['REQUEST_METHOD'].upper()
self._post_parse_error = False
- if isinstance(self.environ['wsgi.input'], socket._fileobject):
+ if type(socket._fileobject) is type and isinstance(self.environ['wsgi.input'], socket._fileobject):
# Under development server 'wsgi.input' is an instance of
# socket._fileobject which hangs indefinitely on reading bytes past
# available count. To prevent this it's wrapped in LimitedStream
@@ -144,6 +144,9 @@ def __init__(self, environ):
# streams) beacuse they don't suffer from this problem and we can
# avoid using another wrapper with its own .read and .readline
# implementation.
+ #
+ # The type check is done because for some reason, AppEngine
+ # implements _fileobject as a function, not a class.
try:
content_length = int(self.environ.get('CONTENT_LENGTH', 0))
except (ValueError, TypeError):

0 comments on commit c906b27

Please sign in to comment.
Something went wrong with that request. Please try again.