diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-05-08 12:32:46 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-05-08 12:32:46 -0300 |
| commit | 0a15a38d75ebebdeda4727580e82290e87663816 (patch) | |
| tree | a20c8f26e5bbaa12cfed8dae13785feab0672e4a | |
| parent | cac103c5680c7a7703441143c2eb350bf20e7c52 (diff) | |
| parent | 81c8b51db237830e25557f84c6bad155e5741275 (diff) | |
| download | pfsense-0a15a38d75ebebdeda4727580e82290e87663816.zip pfsense-0a15a38d75ebebdeda4727580e82290e87663816.tar.gz | |
Merge pull request #1133 from msilvoso/master
| -rw-r--r-- | etc/inc/pkg-utils.inc | 1 | ||||
| -rw-r--r-- | etc/inc/xmlrpc_client.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 3541b3e..99385f1 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -47,7 +47,6 @@ if(file_exists("/cf/conf/use_xmlreader")) require_once("xmlreader.inc"); else require_once("xmlparse.inc"); -require_once("service-utils.inc"); require_once("pfsense-utils.inc"); if(!function_exists("update_status")) { diff --git a/etc/inc/xmlrpc_client.inc b/etc/inc/xmlrpc_client.inc index cc91f6d..fbbf977 100644 --- a/etc/inc/xmlrpc_client.inc +++ b/etc/inc/xmlrpc_client.inc @@ -1002,7 +1002,7 @@ class XML_RPC_Client extends XML_RPC_Base { return false; } if ($this->proxy) { - $this->headers = 'POST ' . $this->protocol . $this->server; + $this->headers = 'POST ' . ($this->protocol=='ssl://'?'https://':$this->protocol). $this->server; if ($this->proxy_port) { $this->headers .= ':' . $this->port; } |
