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

scv119 · Jan 21, 2012 · 4edf278 · 4edf278
2 parents 1014d56 + 756fada
commit 4edf278
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tornado/httpserver.py b/tornado/httpserver.py
@@ -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):