Merge branch 'hotfix/122' into develop

Forward port #122

Author: weierophinney

CHANGELOG.md

@@ -40,6 +40,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#122](https://github.com/zendframework/zend-http/pull/122) fixes an issue with the stream response whereby if the `outputstream`
+  option is set, the output file was opened twice; it is now opened exactly once.
+
 - [#147](https://github.com/zendframework/zend-http/pull/147) fixes an issue with header retrieval when the header line is malformed.
   Previously, an exception would be raised if a specific `HeaderInterface` implementation determined
   the header line was invalid. Now, `Header::has()` will return false for such headers, allowing

src/Client.php

@@ -68,6 +68,11 @@ class Client implements Stdlib\DispatchableInterface
      */
     protected $streamName;
 
+    /**
+     * @var resource|null
+     */
+    protected $streamHandle = null;
+
     /**
      * @var array of Header\SetCookie
      */
@@ -925,11 +930,17 @@ public function send(Request $request = null)
                 throw new Client\Exception\RuntimeException('Adapter does not support streaming');
             }
 
+            $this->streamHandle = null;
             // calling protected method to allow extending classes
             // to wrap the interaction with the adapter
             $response = $this->doRequest($uri, $method, $secure, $headers, $body);
+            $stream = $this->streamHandle;
+            $this->streamHandle = null;
 
             if (! $response) {
+                if ($stream !== null) {
+                    fclose($stream);
+                }
                 throw new Exception\RuntimeException('Unable to read response, or response is empty');
             }
 
@@ -940,9 +951,11 @@ 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 ($stream === null) {
+                    $stream = $this->getStream();
+                    if (! is_resource($stream) && is_string($stream)) {
+                        $stream = fopen($stream, 'r');
+                    }
                 }
                 $streamMetaData = stream_get_meta_data($stream);
                 if ($streamMetaData['seekable']) {
@@ -1424,8 +1437,8 @@ protected function doRequest(Http $uri, $method, $secure = false, $headers = [],
 
         if ($this->config['outputstream']) {
             if ($this->adapter instanceof Client\Adapter\StreamInterface) {
-                $stream = $this->openTempStream();
-                $this->adapter->setOutputStream($stream);
+                $this->streamHandle = $this->openTempStream();
+                $this->adapter->setOutputStream($this->streamHandle);
             } else {
                 throw new Exception\RuntimeException('Adapter does not support streaming');
             }

test/Client/StaticTest.php

@@ -501,6 +501,36 @@ public function testOpenTempStreamWithValidFileDoesntThrowsException()
         // @todo verify link is still active
     }
 
+    /**
+     * Test if a downloaded file can be deleted
+     *
+     * @group ZF-9685
+     */
+    public function testDownloadedFileCanBeDeleted()
+    {
+        if (! getenv('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
+        $url = 'http://www.example.com/';
+        $outputFile = @tempnam(@sys_get_temp_dir(), 'zht');
+        if (! is_file($outputFile)) {
+            $this->markTestSkipped('Failed to create a temporary file');
+        }
+        $config = [
+            'outputstream' => $outputFile,
+        ];
+        $client = new HTTPClient($url, $config);
+
+        $result = $client->send();
+
+        $this->assertInstanceOf('Zend\Http\Response\Stream', $result);
+        if (DIRECTORY_SEPARATOR === '\\') {
+            $this->assertFalse(@unlink($outputFile), 'Deleting an open file should fail on Windows');
+        }
+        fclose($result->getStream());
+        $this->assertTrue(@unlink($outputFile), 'Failed to delete downloaded file');
+    }
+
     /**
      * Testing if the connection can be closed
      *