aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/inc/HTTPClient.php
diff options
context:
space:
mode:
authorMichael Grosse <grosse@cosmocode.de>2016-04-11 11:55:50 +0200
committerMichael Grosse <grosse@cosmocode.de>2016-04-11 11:55:50 +0200
commit4167de31e4c8a81602860a18194badb211efeada (patch)
treee2bf72381088607ba6132ef16fecd6aa39a40d15 /inc/HTTPClient.php
parentabaeff3a0c367fb29bc3f1d4b98efde56f7050f5 (diff)
downloaddokuwiki-4167de31e4c8a81602860a18194badb211efeada.tar.gz
dokuwiki-4167de31e4c8a81602860a18194badb211efeada.zip
use SSL if scheme is https
This is to ensure that we use SSL/TLS if a custom port is defined an no proxy is used. Fixes #1526
Diffstat (limited to 'inc/HTTPClient.php')
-rw-r--r--inc/HTTPClient.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 4aefcfe5a..e87ce741a 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -278,7 +278,7 @@ class HTTPClient {
}
// add SSL stream prefix if needed - needs SSL support in PHP
- if($port == 443 || $this->proxy_ssl) {
+ if($port == 443 || $this->proxy_ssl || $uri['scheme'] == 'https') {
if(!in_array('ssl', stream_get_transports())) {
$this->status = -200;
$this->error = 'This PHP version does not support SSL - cannot connect to server';