Skip to content
GitLab
Commit 876d6703 authored by tbrehm's avatar tbrehm
Browse files

Fixed: FS#1911 - Infinite loop in aliasdomain redirects

parent e589cc1d
Hide whitespace changes
Inline Side-by-side
server/plugins-available/apache2_plugin.inc.php
View file @ 876d6703
......@@ -730,7 +730,7 @@ class apache2_plugin {
'rewrite_target_ssl' => $rewrite_target_ssl);
break;
case '*':
$rewrite_rules[] = array( 'rewrite_domain' => $data['new']['domain'],
$rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)'.$data['new']['domain'],
'rewrite_type' => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
'rewrite_target' => $rewrite_target,
'rewrite_target_ssl' => $rewrite_target_ssl);
......@@ -796,7 +796,7 @@ class apache2_plugin {
'rewrite_target_ssl' => $rewrite_target_ssl);
break;
case '*':
$rewrite_rules[] = array( 'rewrite_domain' => $alias['domain'],
$rewrite_rules[] = array( 'rewrite_domain' => '(^|\.)'.$alias['domain'],
'rewrite_type' => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
'rewrite_target' => $rewrite_target,
'rewrite_target_ssl' => $rewrite_target_ssl);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment