[CalendarServer-changes] [3129] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 3129
          http://trac.macosforge.org/projects/calendarserver/changeset/3129
Author:   cdaboo at apple.com
Date:     2008-10-07 12:39:31 -0700 (Tue, 07 Oct 2008)
Log Message:
-----------
Make sure HTTP headers are always str's and not unicode's.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py
    CalendarServer/trunk/twistedcaldav/util.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py	2008-10-07 17:45:19 UTC (rev 3128)
+++ CalendarServer/trunk/twistedcaldav/scheduling/ischedule.py	2008-10-07 19:39:31 UTC (rev 3129)
@@ -34,6 +34,7 @@
 from twistedcaldav.log import Logger
 from twistedcaldav.scheduling.delivery import DeliveryService
 from twistedcaldav.scheduling.ischeduleservers import IScheduleServers
+from twistedcaldav.util import utf8String
 
 """
 Server to server utility functions and client requests.
@@ -145,11 +146,11 @@
 
     def _generateHeaders(self):
         self.headers = Headers()
-        self.headers.setHeader('Host', self.server.host + ":%s" % (self.server.port,))
-        self.headers.addRawHeader('Originator', self.scheduler.originator.cuaddr)
+        self.headers.setHeader('Host', utf8String(self.server.host + ":%s" % (self.server.port,)))
+        self.headers.addRawHeader('Originator', utf8String(self.scheduler.originator.cuaddr))
         self._doAuthentication()
         for recipient in self.recipients:
-            self.headers.addRawHeader('Recipient', recipient.cuaddr)
+            self.headers.addRawHeader('Recipient', utf8String(recipient.cuaddr))
         self.headers.setHeader('Content-Type', MimeType("text", "calendar", params={"charset":"utf-8"}))
 
     def _doAuthentication(self):

Modified: CalendarServer/trunk/twistedcaldav/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/util.py	2008-10-07 17:45:19 UTC (rev 3128)
+++ CalendarServer/trunk/twistedcaldav/util.py	2008-10-07 19:39:31 UTC (rev 3129)
@@ -108,3 +108,8 @@
         state = self._state
         self._state = not state
         return state
+
+def utf8String(s):
+    if isinstance(s, unicode):
+        s = s.encode("utf-8")
+    return s
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081007/c8256207/attachment.html