Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
lolo888
ISPConfig 3
Commits
c7d735ff
Commit
c7d735ff
authored
Sep 13, 2012
by
mcramer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix: previous bugfix was missing a thing
parent
95e8cecd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/apache2_plugin.inc.php
+1
-1
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+1
-1
No files found.
server/plugins-available/apache2_plugin.inc.php
View file @
c7d735ff
...
...
@@ -981,7 +981,7 @@ class apache2_plugin {
'rewrite_target_ssl'
=>
$rewrite_target_ssl
);
break
;
default
:
if
(
substr
(
$alias
[
'domain'
],
0
,
2
)
===
'*.'
)
$domain_rule
=
'(^|\.)'
.
$this
->
_rewrite_quote
(
$alias
[
'domain'
]);
if
(
substr
(
$alias
[
'domain'
],
0
,
2
)
===
'*.'
)
$domain_rule
=
'(^|\.)'
.
$this
->
_rewrite_quote
(
substr
(
$alias
[
'domain'
]
,
2
)
);
else
$domain_rule
=
'^'
.
$this
->
_rewrite_quote
(
$alias
[
'domain'
]);
$rewrite_rules
[]
=
array
(
'rewrite_domain'
=>
$domain_rule
,
'rewrite_type'
=>
(
$alias
[
'redirect_type'
]
==
'no'
)
?
''
:
'['
.
$alias
[
'redirect_type'
]
.
']'
,
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
c7d735ff
...
...
@@ -1172,7 +1172,7 @@ class nginx_plugin {
unset
(
$tmp_redirect_path
);
unset
(
$tmp_redirect_path_parts
);
}
if
(
substr
(
$alias
[
'domain'
],
0
,
2
)
===
'*.'
)
$domain_rule
=
'(^|\.)'
.
$this
->
_rewrite_quote
(
$alias
[
'domain'
]);
if
(
substr
(
$alias
[
'domain'
],
0
,
2
)
===
'*.'
)
$domain_rule
=
'(^|\.)'
.
$this
->
_rewrite_quote
(
substr
(
$alias
[
'domain'
]
,
2
)
);
else
$domain_rule
=
'^'
.
$this
->
_rewrite_quote
(
$alias
[
'domain'
]);
$rewrite_rules
[]
=
array
(
'rewrite_domain'
=>
$domain_rule
,
'rewrite_type'
=>
(
$alias
[
'redirect_type'
]
==
'no'
)
?
''
:
$alias
[
'redirect_type'
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment