diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-08-23 18:08:28 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-08-23 18:08:28 +0000 |
| commit | 77bf14d5817d6b8bcea26607fb52b57d0908ffac (patch) | |
| tree | bf98156e19b99478c5962a8573d9cfe7f78aa996 | |
| parent | 64ca36bf0832d9d72fc26293f3aebed7d8b24a52 (diff) | |
Fixed #8259 -- Handle an error situation that we should never see, but still
occurs for some reason (be liberal in what you accept, and all that). Patch
from kevin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/handlers/wsgi.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 1ec382db14..d1336b33be 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -173,7 +173,10 @@ class WSGIRequest(http.HttpRequest): try: # CONTENT_LENGTH might be absent if POST doesn't have content at all (lighttpd) content_length = int(self.environ.get('CONTENT_LENGTH', 0)) - except ValueError: # if CONTENT_LENGTH was empty string or not an integer + except (ValueError, TypeError): + # If CONTENT_LENGTH was empty string or not an integer, don't + # error out. We've also seen None passed in here (against all + # specs, but see ticket #8259), so we handle TypeError as well. content_length = 0 if content_length > 0: safe_copyfileobj(self.environ['wsgi.input'], buf, |