Merge pull request #20 from bepatient-fr/FIx_content_length_header_no…

…t_computed_on_bytes

Fix Content-Length header not calculated on bytes length

ikaaro/web/wsgi.py

@@ -68,19 +68,18 @@ def application(environ, start_response):
             log.error("Internal error : {}".format(tb), exc_info=True)
             context.set_default_response(500)
         finally:
+            data = context.entity
+            if isinstance(data, str):
+                data = data.encode("utf-8")
             headers = context.header_response
             if context.content_type:
                 headers.append(('Content-Type', context.content_type))
-            if context.entity and not isinstance(context.entity, Reference):
-                headers.append(('Content-Length', str(len(context.entity))))
+            if data and not isinstance(data, Reference):
+                headers.append(('Content-Length', str(len(data))))
             status = context.status or 500
             status = '{0} {1}'.format(status, reason_phrases[status])
             start_response(str(status), headers)
-            data = context.entity
-            if isinstance(data, str):
-                yield data.encode("utf-8")
-            else:
-                yield data
+            yield data
 
 
 try:

scripts/icms-forget.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 # Copyright (C) 2009 Juan David Ibáñez Palomar <[email protected]>
 #

scripts/icms-start.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 # Copyright (C) 2005-2007 Juan David Ibáñez Palomar <[email protected]>
 # Copyright (C) 2006 Hervé Cauwelier <[email protected]>

scripts/icms-stop.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 # Copyright (C) 2005-2007 Juan David Ibáñez Palomar <[email protected]>
 # Copyright (C) 2007 Sylvain Taverne <[email protected]>

scripts/icms-update-catalog.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 # Copyright (C) 2007 Hervé Cauwelier <[email protected]>
 # Copyright (C) 2007-2008 Juan David Ibáñez Palomar <[email protected]>