Use text/plain content type for base64 encoded responses

Fixes #33
miguelgrinberg · Jan 23, 2017 · 297ff98 · 297ff98
1 parent e0541bc
commit 297ff98
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/engineio/server.py b/engineio/server.py
@@ -374,7 +374,10 @@ def _ok(self, packets=None, headers=None, b64=False):
         if packets is not None:
             if headers is None:
                 headers = []
-            headers += [('Content-Type', 'application/octet-stream')]
+            if b64:
+                headers += [('Content-Type', 'text/plain; charset=UTF-8')]
+            else:
+                headers += [('Content-Type', 'application/octet-stream')]
             return {'status': '200 OK',
                     'headers': headers,
                     'response': payload.Payload(packets=packets).encode(b64)}

diff --git a/tests/test_server.py b/tests/test_server.py
@@ -325,6 +325,8 @@ def test_connect(self):
         self.assertEqual(len(s.sockets), 1)
         self.assertEqual(start_response.call_count, 1)
         self.assertEqual(start_response.call_args[0][0], '200 OK')
+        self.assertIn(('Content-Type', 'application/octet-stream'),
+                      start_response.call_args[0][1])
         self.assertEqual(len(r), 1)
         packets = payload.Payload(encoded_payload=r[0]).packets
         self.assertEqual(len(packets), 1)
@@ -348,6 +350,8 @@ def test_connect_b64_with_1(self):
         start_response = mock.MagicMock()
         s.handle_request(environ, start_response)
         self.assertTrue(start_response.call_args[0][0], '200 OK')
+        self.assertIn(('Content-Type', 'text/plain; charset=UTF-8'),
+                      start_response.call_args[0][1])
         s.send('1', b'\x00\x01\x02', binary=True)
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=1&b64=1'}
         r = s.handle_request(environ, start_response)
@@ -360,6 +364,8 @@ def test_connect_b64_with_true(self):
         start_response = mock.MagicMock()
         s.handle_request(environ, start_response)
         self.assertTrue(start_response.call_args[0][0], '200 OK')
+        self.assertIn(('Content-Type', 'text/plain; charset=UTF-8'),
+                      start_response.call_args[0][1])
         s.send('1', b'\x00\x01\x02', binary=True)
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=1&b64=true'}
         r = s.handle_request(environ, start_response)
@@ -372,6 +378,8 @@ def test_connect_b64_with_0(self):
         start_response = mock.MagicMock()
         s.handle_request(environ, start_response)
         self.assertTrue(start_response.call_args[0][0], '200 OK')
+        self.assertIn(('Content-Type', 'application/octet-stream'),
+                      start_response.call_args[0][1])
         s.send('1', b'\x00\x01\x02', binary=True)
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=1&b64=0'}
         r = s.handle_request(environ, start_response)
@@ -384,6 +392,8 @@ def test_connect_b64_with_false(self):
         start_response = mock.MagicMock()
         s.handle_request(environ, start_response)
         self.assertTrue(start_response.call_args[0][0], '200 OK')
+        self.assertIn(('Content-Type', 'application/octet-stream'),
+                      start_response.call_args[0][1])
         s.send('1', b'\x00\x01\x02', binary=True)
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'sid=1&b64=false'}
         r = s.handle_request(environ, start_response)