--- a/thirdparty/google_appengine/google/appengine/dist/httplib.py	Mon Jun 08 22:34:05 2009 +0200
+++ b/thirdparty/google_appengine/google/appengine/dist/httplib.py	Fri Jun 19 16:13:32 2009 +0200
@@ -188,7 +188,10 @@
         host = '%s:%s' % (self.host, self.port)
     else:
         host = self.host
-    url = '%s://%s%s' % (self.protocol, host, self._url)
+    if not self._url.startswith(self.protocol):
+      url = '%s://%s%s' % (self.protocol, host, self._url)
+    else:
+      url = self._url
     headers = dict(self.headers)
 
     try:
@@ -237,7 +240,7 @@
   def msg(self):
     msg = mimetools.Message(StringIO.StringIO(''))
     for name, value in self._fetch_response.headers.items():
-      msg[name] = value
+      msg[name] = str(value)
     return msg
 
   version = 11