maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

allow non-standard ssl-port for ssl-redirects (actually, put the port in there if non-standard is defined in ip/port combination), fixes #201

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-25 17:08:06 +02:00
parent a993295356
commit 7cdfdda45c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -638,7 +638,11 @@ class apache
&& $domain['ssl'] == '1' && $domain['ssl'] == '1'
&& $domain['ssl_redirect'] == '1') && $domain['ssl_redirect'] == '1')
) { ) {
$domain['documentroot'] = 'https://' . $domain['domain'] . '/'; $_sslport = '';
if ($domain['port'] != '443') {
$_sslport = ":".$domain['port'];
}
$domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/';
} }
if ($ssl_vhost === true if ($ssl_vhost === true

6
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -398,7 +398,11 @@ class nginx
&& $domain['ssl'] == '1' && $domain['ssl'] == '1'
&& $domain['ssl_redirect'] == '1') && $domain['ssl_redirect'] == '1')
{ {
$domain['documentroot'] = 'https://' . $domain['domain'] . '/'; $_sslport = '';
if ($domain['port'] != '443') {
$_sslport = ":".$domain['port'];
}
$domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/';
} }
// if the documentroot is an URL we just redirect // if the documentroot is an URL we just redirect