Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #9659: fixed `wsgi.file_wrapper` in the builtin server.…

… Thanks, mitsuhiko. Backport of [10690] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 67f9ad2801ce3d9da9e7739c07d81f759dbee162 1 parent 9b724ae
@jacobian jacobian authored
View
13 django/core/servers/basehttp.py
@@ -306,14 +306,15 @@ def setup_environ(self):
env.setdefault('SERVER_SOFTWARE',self.server_software)
def finish_response(self):
- """Send any iterable data, then close self and the iterable
+ """
+ Send any iterable data, then close self and the iterable
- Subclasses intended for use in asynchronous servers will
- want to redefine this method, such that it sets up callbacks
- in the event loop to iterate over the data, and to call
- 'self.close()' once the response is finished.
+ Subclasses intended for use in asynchronous servers will want to
+ redefine this method, such that it sets up callbacks in the event loop
+ to iterate over the data, and to call 'self.close()' once the response
+ is finished.
"""
- if not self.result_is_file() and not self.sendfile():
+ if not self.result_is_file() or not self.sendfile():
for data in self.result:
self.write(data)
self.finish_content()
View
0  tests/regressiontests/builtin_server/__init__.py
No changes.
View
0  tests/regressiontests/builtin_server/models.py
No changes.
View
51 tests/regressiontests/builtin_server/tests.py
@@ -0,0 +1,51 @@
+from unittest import TestCase
+from StringIO import StringIO
+from django.core.servers.basehttp import ServerHandler
+
+#
+# Tests for #9659: wsgi.file_wrapper in the builtin server.
+# We need to mock a couple of of handlers and keep track of what
+# gets called when using a couple kinds of WSGI apps.
+#
+
+class DummyHandler(object):
+ def log_request(*args, **kwargs):
+ pass
+
+class FileWrapperHandler(ServerHandler):
+ def __init__(self, *args, **kwargs):
+ ServerHandler.__init__(self, *args, **kwargs)
+ self.request_handler = DummyHandler()
+ self._used_sendfile = False
+
+ def sendfile(self):
+ self._used_sendfile = True
+ return True
+
+def wsgi_app(environ, start_response):
+ start_response('200 OK', [('Content-Type', 'text/plain')])
+ return ['Hello World!']
+
+def wsgi_app_file_wrapper(environ, start_response):
+ start_response('200 OK', [('Content-Type', 'text/plain')])
+ return environ['wsgi.file_wrapper'](StringIO('foo'))
+
+class WSGIFileWrapperTests(TestCase):
+ """
+ Test that the wsgi.file_wrapper works for the builting server.
+ """
+
+ def test_file_wrapper_uses_sendfile(self):
+ env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
+ err = StringIO()
+ handler = FileWrapperHandler(None, StringIO(), err, env)
+ handler.run(wsgi_app_file_wrapper)
+ self.assert_(handler._used_sendfile)
+
+ def test_file_wrapper_no_sendfile(self):
+ env = {'SERVER_PROTOCOL': 'HTTP/1.0'}
+ err = StringIO()
+ handler = FileWrapperHandler(None, StringIO(), err, env)
+ handler.run(wsgi_app)
+ self.failIf(handler._used_sendfile)
+ self.assertEqual(handler.stdout.getvalue().splitlines()[-1],'Hello World!')
Please sign in to comment.
Something went wrong with that request. Please try again.