Merge branch 'yurevichcv-feature/body-stream-fixes' into 3.x

slimphp · Jul 27, 2015 · cc0017a · cc0017a
2 parents d13a44b + 74c9e19
commit cc0017a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Slim/App.php b/Slim/App.php
@@ -323,8 +323,12 @@ public function respond(ResponseInterface $response)
                 $settings = $this->container->get('settings');
                 while (!$body->eof()) {
                     echo $body->read($settings['responseChunkSize']);
+                    if (connection_status() != CONNECTION_NORMAL) {
+                        break;
+                    }
                 }
             }
+
             $responded = true;
         }
     }

diff --git a/Slim/Route.php b/Slim/Route.php
@@ -321,7 +321,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             $response->getBody()->write($newResponse);
         }
 
-        if (isset($output)) {
+        if (!empty($output)) {
             if ($this->outputBuffering === 'prepend') {
                 // prepend output buffer content
                 $body = new Http\Body(fopen('php://temp', 'r+'));