Merge branch 'TRADE-501' into 'master'

classes/fpf/http/CurlHttpClient.php

@@ -167,9 +167,9 @@ class CurlHttpClient
         $this->response = curl_exec($this->curl_handle);
         // Connect failed?
         if (!$this->response) {
-            curl_close($this->curl_handle);
             $error = 'CurlHttpClient: Could not connect to ' . $full_url;
             \Yii::$app->fpf->error('http',  curl_errno($this->curl_handle), __CLASS__, __FUNCTION__,  ' ERROR:' .$error);
+            curl_close($this->curl_handle);
             $this->curl_handle = null;
             throw new CurlHttpException($error, CurlHttpException::NOT_OPEN);
         }

classes/fpf/thrift/TCurlClient.php

@@ -234,9 +234,9 @@ class TCurlClient extends \Thrift\Transport\TTransport
         $this->response_ = curl_exec($this->handle);
         // Connect failed?
         if (!$this->response_) {
-            curl_close($this->handle);
             $error = 'TCurlClient: Could not connect to ' . $full_url;
             \Yii::$app->fpf->error('http',  curl_errno($this->handle), __CLASS__, __FUNCTION__,  ' ERROR:' .$error);
+            curl_close($this->handle);
             $this->handle = null;
             throw new TTransportException($error, TTransportException::NOT_OPEN);
         }