Merge pull request #71 from php-http/Nyholm-non-seekable

Make sure we do not rewind a non-seekable stream

Author: dbu

spec/StreamFactory/StreamFactoryBehavior.php

@@ -24,4 +24,12 @@ function it_creates_a_stream_from_null()
     {
         $this->createStream(null)->shouldHaveType('Psr\Http\Message\StreamInterface');
     }
+
+    function it_creates_a_stream_from_non_seekable_resource()
+    {
+        $url = 'https://raw.githubusercontent.com/php-http/multipart-stream-builder/master/tests/Resources/httplug.png';
+        $resource = fopen($url, 'r');
+        $this->createStream($resource)
+            ->shouldHaveType('Psr\Http\Message\StreamInterface');
+    }
 }

src/StreamFactory/DiactorosStreamFactory.php

@@ -34,7 +34,9 @@ public function createStream($body = null)
             }
         }
 
-        $body->rewind();
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
 
         return $body;
     }

src/StreamFactory/SlimStreamFactory.php

@@ -35,7 +35,9 @@ public function createStream($body = null)
             $stream->write((string) $body);
         }
 
-        $stream->rewind();
+        if ($stream->isSeekable()) {
+            $stream->rewind();
+        }
 
         return $stream;
     }