Moved printdebug to use intercept_output

1 files changed, 5 insertions, 2 deletions

diff --git a/paste/printdebug.py b/paste/printdebug.py
index e44b33b..973322e 100644
--- a/paste/printdebug.py
+++ b/paste/printdebug.py
@@ -62,8 +62,8 @@ class PrintDebugMiddleware(object):
         output = StringIO()
         try:
             threadedprint.register(replacement_stdout)
-            status, headers, body = wsgilib.capture_output(
-                environ, start_response, self.app)
+            status, headers, body = wsgilib.intercept_output(
+                environ, self.app)
             if status is None:
                 # Some error occurred
                 status = '500 Server Error'
@@ -78,8 +78,11 @@ class PrintDebugMiddleware(object):
                 if replacement_stdout == logged:
                     # Then the prints will be lost, unless...
                     environ['wsgi.errors'].write(logged.getvalue())
+                start_response(status, headers)
                 return [body]
+            wsgilib.remove_header(headers, 'content-length')
             body = self.add_log(body, logged.getvalue())
+            start_response(status, headers)
             return [body]
         finally:
             threadedprint.deregister()