diff options
| author | Valentin Sheyretski <valioz@gmail.com> | 2012-07-02 11:04:36 +0200 |
|---|---|---|
| committer | Valentin Sheyretski <valioz@gmail.com> | 2012-07-02 11:04:36 +0200 |
| commit | cfcf34e0bb9fbac5498740711552d04be3b7e63c (patch) | |
| tree | e76abfc1a2b56cbcb35ebffe076ce1246f0436d8 /system/libraries | |
| parent | 9dee5350d57523885e9a9f696bff418c1908e72c (diff) | |
Update develop
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Xmlrpc.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index 80648c9bd..58389bf32 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -174,7 +174,7 @@ class CI_Xmlrpc { * @param int port * @return void */ - public function server($url, $port = 80, $proxy=FALSE, $proxy_port = 8080) + public function server($url, $port = 80, $proxy = FALSE, $proxy_port = 8080) { if (strpos($url, 'http') !== 0) { @@ -440,12 +440,15 @@ class XML_RPC_Client extends CI_Xmlrpc */ public function sendPayload($msg) { - $server = $this->server; - $port = $this->port; - if ($this->proxy !== FALSE) { + if ($this->proxy === FALSE) + { + $server = $this->server; + $port = $this->port; + } else { $server = $this->proxy; $port = $this->proxy_port; } + $fp = @fsockopen($server, $port, $this->errno, $this->errstring, $this->timeout); if ( ! is_resource($fp)) |