Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
b5b6136d
Commit
b5b6136d
authored
Mar 08, 2014
by
Falko Timme
Browse files
- Fixed FS#3365 - Valid nginx rewrite rules are rejected with "Invalid Rewrite Rules" message
parent
1d6097a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/sites/web_domain_edit.php
View file @
b5b6136d
...
...
@@ -691,6 +691,9 @@ class page_action extends tform_actions {
if
(
trim
(
$rewrite_rule_line
)
==
''
)
continue
;
// rewrite
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?\S+(\$)?\s+\S+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$rewrite_rule_line
))
continue
;
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?(\'[^\']+\'|"[^"]+")+(\$)?\s+(\'[^\']+\'|"[^"]+")+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$rewrite_rule_line
))
continue
;
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?(\'[^\']+\'|"[^"]+")+(\$)?\s+\S+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$rewrite_rule_line
))
continue
;
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?\S+(\$)?\s+(\'[^\']+\'|"[^"]+")+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$rewrite_rule_line
))
continue
;
// if
if
(
preg_match
(
'@^\s*if\s+\(\s*\$\S+(\s+(\!?(=|~|~\*))\s+(\S+|\".+\"))?\s*\)\s*\{\s*$@'
,
$rewrite_rule_line
)){
$if_level
+=
1
;
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
b5b6136d
...
...
@@ -986,6 +986,18 @@ class nginx_plugin {
$final_rewrite_rules
[]
=
array
(
'rewrite_rule'
=>
$custom_rewrite_rule_line
);
continue
;
}
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?(\'[^\']+\'|"[^"]+")+(\$)?\s+(\'[^\']+\'|"[^"]+")+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$custom_rewrite_rule_line
)){
$final_rewrite_rules
[]
=
array
(
'rewrite_rule'
=>
$custom_rewrite_rule_line
);
continue
;
}
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?(\'[^\']+\'|"[^"]+")+(\$)?\s+\S+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$custom_rewrite_rule_line
)){
$final_rewrite_rules
[]
=
array
(
'rewrite_rule'
=>
$custom_rewrite_rule_line
);
continue
;
}
if
(
preg_match
(
'@^\s*rewrite\s+(^/)?\S+(\$)?\s+(\'[^\']+\'|"[^"]+")+(\s+(last|break|redirect|permanent|))?\s*;\s*$@'
,
$custom_rewrite_rule_line
)){
$final_rewrite_rules
[]
=
array
(
'rewrite_rule'
=>
$custom_rewrite_rule_line
);
continue
;
}
// if
if
(
preg_match
(
'@^\s*if\s+\(\s*\$\S+(\s+(\!?(=|~|~\*))\s+(\S+|\".+\"))?\s*\)\s*\{\s*$@'
,
$custom_rewrite_rule_line
)){
$final_rewrite_rules
[]
=
array
(
'rewrite_rule'
=>
$custom_rewrite_rule_line
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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