Merge pull request #36 from iainsaxon/defined-curl-transport-timeouts

Wrapped timeout constants in conditional checks
campaignmonitor · Oct 29, 2014 · 543e569 · 543e569
2 parents afeb627 + 6268402
commit 543e569
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/class/transport.php b/class/transport.php
@@ -4,8 +4,12 @@
 define('CS_REST_POST', 'POST');
 define('CS_REST_PUT', 'PUT');
 define('CS_REST_DELETE', 'DELETE');
-define('CS_REST_SOCKET_TIMEOUT', 10);
-define('CS_REST_CALL_TIMEOUT', 10);
+if (false === defined('CS_REST_SOCKET_TIMEOUT')) {
+    define('CS_REST_SOCKET_TIMEOUT', 10);
+}
+if (false === defined('CS_REST_CALL_TIMEOUT')) {
+    define('CS_REST_CALL_TIMEOUT', 10);
+}
 
 function CS_REST_TRANSPORT_get_available($requires_ssl, $log) {
     if(function_exists('curl_init') && function_exists('curl_exec')) {
@@ -328,4 +332,4 @@ function _build_request($call_options, $host, $path, $accept_gzip) {
 
         return $request."\n\n";
     }
-}
+}