Permalink
Browse files

Merge remote-tracking branch 'nephics/master' into work

  • Loading branch information...
2 parents 1014d56 + 756fada commit 4edf2782b56d345b723f290839081b98f25aaad4 @bdarnell bdarnell committed Jan 21, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 tornado/httpserver.py
View
@@ -409,7 +409,7 @@ def cookies(self):
self._cookies.load(
native_str(self.headers["Cookie"]))
except Exception:
- self._cookies = None
+ self._cookies = {}
return self._cookies
def write(self, chunk, callback=None):

0 comments on commit 4edf278

Please sign in to comment.