Changeset 7377

Timestamp:

07/22/2008 01:40:29 PM (5 weeks ago)

Author:

cmlenz

Message:

Merged [7376] to trunk.

Location:

trunk/trac/web

Files:

• api.py (modified) (2 diffs)
• wsgi.py (modified) (1 diff)

trunk/trac/web/api.py

@@ -30 +30 @@
 from trac.util.datefmt import http_date, localtz
 from trac.web.href import Href
+from trac.web.wsgi import _FileWrapper
 
 HTTP_STATUS = dict([(code, reason.title()) for code, (reason, description)
@@ -401 +402 @@
 
         if self.method != 'HEAD':
-            self._response = file(path, 'rb')
-            file_wrapper = self.environ.get('wsgi.file_wrapper')
-            if file_wrapper:
-                self._response = file_wrapper(self._response, 4096)
+            fileobj = file(path, 'rb')
+            file_wrapper = self.environ.get('wsgi.file_wrapper', _FileWrapper)
+            self._response = file_wrapper(fileobj, 4096)
         raise RequestDone
 

trunk/trac/web/wsgi.py

@@ -87 +87 @@
         response = application(self.environ, self._start_response)
         try:
-            if isinstance(response, self.wsgi_file_wrapper) \
+            if self.wsgi_file_wrapper is not None \
+                    and isinstance(response, self.wsgi_file_wrapper) \
                     and hasattr(self, '_sendfile'):
                 self._sendfile(response.fileobj)