VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-17 19:06:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix double-escaping of virtual host name

Browse Source
This commit is contained in:
Jamie Cameron
2011-10-22 21:37:16 -07:00
parent c7485c68bb
commit 1b40810bea
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apache/index.cgi
View File

@ -96,7 +96,7 @@ if (&can_edit_virt()) {
push(@vdesc, $text{'index_defdesc1'}); push(@vdesc, $text{'index_defdesc1'});
push(@vaddr, $text{'index_any'}); push(@vaddr, $text{'index_any'});
push(@vport, $text{'index_any'}); push(@vport, $text{'index_any'});
push(@vserv, &def($sn, $text{'index_auto'})); push(@vserv, $sn);
push(@vroot, &def(&find_directive("DocumentRoot", $conf, 1), push(@vroot, &def(&find_directive("DocumentRoot", $conf, 1),
$text{'index_auto'})); $text{'index_auto'}));
push(@vproxy, undef); push(@vproxy, undef);
@ -196,7 +196,7 @@ foreach $v (@virt) {
: $addr); : $addr);
push(@vport, $port eq "*" ? $text{'index_any'} : $port); push(@vport, $port eq "*" ? $text{'index_any'} : $port);
local $sn = &find_vdirective("ServerName", $vm, $conf, 1); local $sn = &find_vdirective("ServerName", $vm, $conf, 1);
push(@vserv, &def($sn, $text{'index_auto'})); push(@vserv, $sn);
$pp = &find_directive_struct("ProxyPass", $vm); $pp = &find_directive_struct("ProxyPass", $vm);
if ($pp->{'words'}->[0] eq "/") { if ($pp->{'words'}->[0] eq "/") {
push(@vproxy, $pp->{'words'}->[1]); push(@vproxy, $pp->{'words'}->[1]);
@ -207,8 +207,10 @@ foreach $v (@virt) {
push(@vroot, &def(&find_vdirective("DocumentRoot",$vm,$conf,1), push(@vroot, &def(&find_vdirective("DocumentRoot",$vm,$conf,1),
$text{'index_default'})); $text{'index_default'}));
} }
$cname{$v} = sprintf "%s:%s (%s)", $vserv[$#vserv], $vport[$#vport], $cname{$v} = sprintf "%s:%s (%s)",
$vproxy[$#vproxy] || $vroot[$#vroot]; $vserv[$#vserv] || $text{'index_auto'},
$vport[$#vport],
$vproxy[$#vproxy] || $vroot[$#vroot];
local $sp = $port eq "*" ? $defport : $port; local $sp = $port eq "*" ? $defport : $port;
local $prot = "http"; local $prot = "http";
if (&find_vdirective("SSLEngine", $vm, $conf, 1) eq "on") { if (&find_vdirective("SSLEngine", $vm, $conf, 1) eq "on") {
@ -332,7 +334,7 @@ elsif ($config{'show_list'} && scalar(@vname)) {
push(@cols, "<a href=\"$vlink[$i]\">$vname[$i]</a>"); push(@cols, "<a href=\"$vlink[$i]\">$vname[$i]</a>");
push(@cols, &html_escape($vaddr[$i])); push(@cols, &html_escape($vaddr[$i]));
push(@cols, &html_escape($vport[$i])); push(@cols, &html_escape($vport[$i]));
push(@cols, &html_escape($vserv[$i])); push(@cols, $vserv[$i] || $text{'index_auto'});
push(@cols, &html_escape($vproxy[$i]) || push(@cols, &html_escape($vproxy[$i]) ||
&html_escape($vroot[$i])); &html_escape($vroot[$i]));
push(@cols, "<a href=$vurl[$i]>$text{'index_view'}</a>"); push(@cols, "<a href=$vurl[$i]>$text{'index_view'}</a>");
@ -374,7 +376,8 @@ else {
print "<b>$text{'index_port'}</b> ", print "<b>$text{'index_port'}</b> ",
&html_escape($vport[$i]),"</td>\n"; &html_escape($vport[$i]),"</td>\n";
print "<td width=70%><b>$text{'index_name'}</b> ", print "<td width=70%><b>$text{'index_name'}</b> ",
&html_escape($vserv[$i]),"<br>\n"; (&html_escape($vserv[$i]) || $text{'index_auto'}),
"<br>\n";
if ($vproxy[$i]) { if ($vproxy[$i]) {
print "<b>$text{'index_proxy'}</b> ", print "<b>$text{'index_proxy'}</b> ",
&html_escape($vproxy[$i]),"</td> </tr>\n"; &html_escape($vproxy[$i]),"</td> </tr>\n";