Merge lp:~therp-nl/ocb-web/6.1_fix_1193563 into lp:ocb-web/6.1

[Holger Brunn (Therp)]

[Stefan Rijnhart (Opener) (stefan-opener)]

LGTM

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

[Cristian Salamea (ovnicraft)]

I test it in 6.1, works well for reports (including wk reports).

Regards,

review: Approve

=== modified file 'addons/web/common/http.py'
--- addons/web/common/http.py	2012-06-21 10:33:42 +0000
+++ addons/web/common/http.py	2013-07-20 11:56:23 +0000
@@ -304,7 +304,7 @@
         response = werkzeug.wrappers.Response(data, headers=headers)
         if cookies:
             for k, v in cookies.iteritems():
-                response.set_cookie(k, v)
+                response.set_cookie(k, str(v))
         return response
 
     def not_found(self, description=None):
@@ -500,7 +500,7 @@
                     response = result
 
                 if hasattr(response, 'set_cookie'):
-                    response.set_cookie(self.session_cookie, session.sid)
+                    response.set_cookie(self.session_cookie, str(session.sid))
 
         return response(environ, start_response)