--- client.py.orig      2007-03-30 13:46:07.000000000 -0400
+++ client.py   2007-03-30 19:47:07.000000000 -0400
@@ -7,6 +7,7 @@
 import base64, binascii, cgi, codecs, mimetypes, os
 import random, re, rfc822, stat, time, urllib, urlparse
 import Cookie
+from Cookie import CookieError, BaseCookie, SimpleCookie
 
 from roundup import roundupdb, date, hyperdb, password
 from roundup.cgi import templating, cgitb, TranslationService
@@ -43,6 +44,28 @@
         return match.group(1)
     return '<%s>'%match.group(2)
 
+
+class Cookie(SimpleCookie): 
+    def load(self, rawdata, ignore_parse_errors=False): 
+        if ignore_parse_errors: 
+            self.bad_cookies = [] 
+            self._BaseCookie__set = self._loose_set 
+        SimpleCookie.load(self, rawdata) 
+        if ignore_parse_errors: 
+            self._BaseCookie__set = self._strict_set 
+            for key in self.bad_cookies: 
+                del self[key] 
+ 
+    _strict_set = BaseCookie._BaseCookie__set 
+ 
+    def _loose_set(self, key, real_value, coded_value): 
+        try: 
+            self._strict_set(key, real_value, coded_value) 
+        except CookieError: 
+            self.bad_cookies.append(key) 
+            dict.__setitem__(self, key, None)
+
+
 class Client:
     '''Instantiate to handle one CGI request.
 
@@ -154,7 +177,10 @@
         self.charset = self.STORAGE_CHARSET
 
         # parse cookies (used in charset and session lookups)
-        self.cookie = Cookie.SimpleCookie(self.env.get('HTTP_COOKIE', ''))
+        cookie = self.env.get('HTTP_COOKIE', '')
+        self.cookie = Cookie()
+        if cookie:
+            self.cookie.load(cookie, ignore_parse_errors=True)
 
         self.user = None
         self.userid = None