summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorInstructor, Computer Systems Technology <jim_parry@bcit.ca>2016-10-19 00:28:05 +0200
committerAndrey Andreev <narf@devilix.net>2016-10-20 10:52:16 +0200
commita09ffbc3bc91acd60735c6f1289b97125dae5ed6 (patch)
treeceab0948f306fb9d686e747260e710c69b7e6ba6 /system
parenta9e57732f000e4c90e4cdfbe9e747f6dc416d28c (diff)
Merge pull request #4855 from jim-parry/fix/xmlrpc-timeout
Fix xmlrpc timeout, #4843
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Xmlrpc.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 181a104d0..4be926f0e 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -734,6 +734,8 @@ class XML_RPC_Client extends CI_Xmlrpc
.'User-Agent: '.$this->xmlrpcName.$r
.'Content-Length: '.strlen($msg->payload).$r.$r
.$msg->payload;
+
+ stream_set_timeout($fp,$this->timeout); // set timeout for subsequent operations
for ($written = $timestamp = 0, $length = strlen($op); $written < $length; $written += $result)
{
@@ -753,9 +755,6 @@ class XML_RPC_Client extends CI_Xmlrpc
$result = FALSE;
break;
}
-
- usleep(250000);
- continue;
}
else
{