Merge branch 'hotfix/202' into develop

Forward port #202

src/Response/SapiStreamEmitter.php

@@ -11,6 +11,7 @@
 
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
+use Zend\Diactoros\RelativeStream;
 
 class SapiStreamEmitter implements EmitterInterface
 {
@@ -56,14 +57,15 @@ public function emit(ResponseInterface $response, $maxBufferLength = 8192)
     private function emitBody(ResponseInterface $response, $maxBufferLength)
     {
         $body = $response->getBody();
-        if ($body->isSeekable()) {
-            $body->rewind();
 
-            while (! $body->eof()) {
-                echo $body->read($maxBufferLength);
-            }
-        } else {
+        if (! $body->isSeekable()) {
             echo $body;
+            return;
+        }
+
+        $body->rewind();
+        while (! $body->eof()) {
+            echo $body->read($maxBufferLength);
         }
     }
 
@@ -78,21 +80,21 @@ private function emitBodyRange(array $range, ResponseInterface $response, $maxBu
     {
         list($unit, $first, $last, $length) = $range;
 
-        ++$last; //zero-based position
         $body = $response->getBody();
 
-        if (!$body->isSeekable()) {
+        if (! $body->isSeekable()) {
             $contents = $body->getContents();
-            echo substr($contents, $first, $last - $first);
+            echo substr($contents, $first, $last - $first + 1);
             return;
         }
 
-        $body->seek($first);
-        $pos = $first;
-
-        while (! $body->eof() && $pos < $last) {
-            if (($pos + $maxBufferLength) > $last) {
-                echo $body->read($last - $pos);
+        $body = new RelativeStream($body, $first);
+        $body->rewind();
+        $pos = 0;
+        $length = $last - $first + 1;
+        while (! $body->eof() && $pos < $length) {
+            if (($pos + $maxBufferLength) > $length) {
+                echo $body->read($length - $pos);
                 break;
             }