From 968587ec1a6698451026e826bf47e4bc6f8dbd4f Mon Sep 17 00:00:00 2001
From: Simon Sessingo <simon.sessingoe@gmail.com>
Date: Sat, 16 Dec 2017 15:45:26 +0100
Subject: [PATCH] Optimisations

---
 src/Pecee/Http/HttpRequest.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Pecee/Http/HttpRequest.php b/src/Pecee/Http/HttpRequest.php
index 92f3dd9..3876861 100644
--- a/src/Pecee/Http/HttpRequest.php
+++ b/src/Pecee/Http/HttpRequest.php
@@ -19,9 +19,6 @@ public function __construct($url = null)
             throw new \ErrorException('This service requires the CURL PHP extension.');
         }
 
-        // Disable PHP timeout
-        set_time_limit(0);
-
         $this->reset();
         $this->url = $url;
     }
@@ -304,28 +301,31 @@ public function execute($return = true)
             throw new \InvalidArgumentException('Missing required property: url');
         }
 
-        if (strtolower($this->method) !== 'get') {
+        if (strtolower($this->method) === 'get' && count($this->getPostData()) > 0) {
             $this->url .= ((strpos($this->url, '?') === false) ? '?' : '&');
         }
 
         curl_setopt($handle, CURLOPT_URL, $this->url);
 
-        $response = new HttpResponse($handle);
+        $response = new HttpResponse();
 
         if ($this->contentType !== null) {
             $this->addHeader('Content-Type: ' . $this->contentType);
         }
 
-        if ($this->returnHeader) {
+        if ($this->returnHeader === true) {
             curl_setopt($handle, CURLOPT_HEADER, true);
             curl_setopt($handle, CURLOPT_HEADERFUNCTION, [&$response, 'parseHeader']);
         }
 
-        if ($return) {
+        if ($return === true) {
             curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
         }
 
-        if ($this->timeout) {
+        if ($this->timeout !== null && $this->timeout > 0) {
+            // Disable PHP timeout
+            set_time_limit($this->timeout);
+
             curl_setopt($handle, CURLOPT_CONNECTTIMEOUT_MS, $this->timeout);
             curl_setopt($handle, CURLOPT_TIMEOUT_MS, $this->timeout);
         }
@@ -359,12 +359,12 @@ public function execute($return = true)
         }
 
         // Add headers
-        if (count($this->headers)) {
+        if (count($this->headers) > 0) {
             curl_setopt($handle, CURLOPT_HTTPHEADER, $this->headers);
         }
 
         // Add custom curl options
-        if (count($this->options)) {
+        if (count($this->options) > 0) {
             foreach ((array)$this->options as $option => $value) {
                 curl_setopt($handle, $option, $value);
             }
@@ -375,6 +375,7 @@ public function execute($return = true)
         $response->setInfo(curl_getinfo($handle))->setResponse($output, $this->returnHeader);
 
         curl_close($handle);
+
         unset($output, $handle);
 
         return $response;