Catch cookie errors when parsing cookies (http://trac.pythonpaste.org/pythonpaste/ticket/189)

1 files changed, 9 insertions, 3 deletions

diff --git a/paste/request.py b/paste/request.py
index 1a1d6c5..9af494d 100644
--- a/paste/request.py
+++ b/paste/request.py
@@ -18,7 +18,7 @@ environment to solve common requirements.
 
 """
 import cgi
-from Cookie import SimpleCookie
+from Cookie import SimpleCookie, CookieError
 from StringIO import StringIO
 import urlparse
 import urllib
@@ -45,7 +45,10 @@ def get_cookies(environ):
         if check_header == header:
             return cookies
     cookies = SimpleCookie()
-    cookies.load(header)
+    try:
+        cookies.load(header)
+    except CookieError:
+        pass
     environ['paste.cookies'] = (cookies, header)
     return cookies
 
@@ -65,7 +68,10 @@ def get_cookie_dict(environ):
         if check_header == header:
             return cookies
     cookies = SimpleCookie()
-    cookies.load(header)
+    try:
+        cookies.load(header)
+    except CookieError:
+        pass
     result = {}
     for name in cookies:
         result[name] = cookies[name].value