Merge remote-tracking branch 'weierophinney/hotfix/http-client-streams'

zendframework · Apr 20, 2012 · 8181c8f · 8181c8f
2 parents 7304e37 + ed16b35
commit 8181c8f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -832,6 +832,14 @@ public function send(Request $request = null)
             }
 
             if ($this->config['outputstream']) {
+                $stream = $this->getStream();
+                if (!is_resource($stream) && is_string($stream)) {
+                    $stream = fopen($stream, 'r');
+                }
+                if (!is_resource($stream)) {
+                    $stream = $this->getUri()->toString();
+                    $stream = fopen($stream, 'r');
+                }
                 $streamMetaData = stream_get_meta_data($stream);
                 if ($streamMetaData['seekable']) {
                     rewind($stream);