Author: mzugec Date: Mon Jan 4 17:47:12 2010 New Revision: 60228 URL: http://svn.opensuse.org/viewcvs/yast?rev=60228&view=rev Log: determine vhost by HostIP instead of ServerName (bnc#567027) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaPI/HTTPD.pm Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=60228&r1=60227&r2=60228&view=diff ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Mon Jan 4 17:47:12 2010 @@ -1 +1 @@ -2.18.9 +2.19.0 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-server.changes?rev=60228&r1=60227&r2=60228&view=diff ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Mon Jan 4 17:47:12 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 4 17:43:07 CET 2010 - mzugec@suse.cz + +- determine vhost by HostIP instead of ServerName (bnc#567027) +- 2.19.0 + +------------------------------------------------------------------- Tue Jul 7 12:26:55 CEST 2009 - mzugec@suse.cz - defined proxy_ajp in HTTPModules.pm (bnc#518816) Modified: trunk/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaPI/HTTPD.pm?rev=60228&r1=60227&r2=60228&view=diff ============================================================================== --- trunk/http-server/src/YaPI/HTTPD.pm (original) +++ trunk/http-server/src/YaPI/HTTPD.pm Mon Jan 4 17:47:12 2010 @@ -528,6 +528,8 @@ } else { $vhost_files->{$servername} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; } + + $self->validateNVH(); } @@ -572,25 +574,27 @@ $self->deleteVH($hostid); $self->createVH($hostid, $data, $params); - $self->validateNVH(); +# $self->validateNVH(); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } - my @tmp_data=(); - foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); - } - $vhost_files->{main}{DATA} = \@tmp_data; + + my @tmp_data=(); + foreach my $row (@{$vhost_files->{main}{DATA}}){ + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + } + $vhost_files->{main}{DATA} = \@tmp_data; - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org