Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2014-09-09 19:00:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-http-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2014-08-30 16:04:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2014-09-09 19:00:38.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 9 10:18:02 CEST 2014 - [email protected] + +- Checking initialized/defined variables. (bnc#892933) +- Writing NameVritualHost entry in default-server.conf correctly. +- 3.1.3 + +------------------------------------------------------------------- Old: ---- yast2-http-server-3.1.2.tar.bz2 New: ---- yast2-http-server-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.lhznWZ/_old 2014-09-09 19:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.lhznWZ/_new 2014-09-09 19:00:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-http-server-3.1.2.tar.bz2 -> yast2-http-server-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.2/package/yast2-http-server.changes new/yast2-http-server-3.1.3/package/yast2-http-server.changes --- old/yast2-http-server-3.1.2/package/yast2-http-server.changes 2014-08-29 15:09:10.000000000 +0200 +++ new/yast2-http-server-3.1.3/package/yast2-http-server.changes 2014-09-09 10:49:22.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 9 10:18:02 CEST 2014 - [email protected] + +- Checking initialized/defined variables. (bnc#892933) +- Writing NameVritualHost entry in default-server.conf correctly. +- 3.1.3 + +------------------------------------------------------------------- Fri Aug 29 14:36:49 CEST 2014 - [email protected] - Autoyast conifuration: "main" defines the default server configured in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.2/package/yast2-http-server.spec new/yast2-http-server-3.1.3/package/yast2-http-server.spec --- old/yast2-http-server-3.1.2/package/yast2-http-server.spec 2014-08-29 15:09:10.000000000 +0200 +++ new/yast2-http-server-3.1.3/package/yast2-http-server.spec 2014-09-09 10:49:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.2 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.2/src/modules/HttpServer.rb new/yast2-http-server-3.1.3/src/modules/HttpServer.rb --- old/yast2-http-server-3.1.2/src/modules/HttpServer.rb 2014-08-29 15:09:10.000000000 +0200 +++ new/yast2-http-server-3.1.3/src/modules/HttpServer.rb 2014-09-09 10:49:22.000000000 +0200 @@ -583,6 +583,7 @@ end # setup hosts + default_server = nil Builtins.foreach(Ops.get_list(s, "hosts", [])) do |row| # "main" defines the default server configured in # /etc/apache2/default-server.conf. This has already been @@ -591,10 +592,7 @@ # will be generated. # (bnc#893100) if row["KEY"] == "main" - YaST::HTTPDData.ModifyHost( - row["KEY"], - row["VALUE"] || [] - ) + default_server = row else YaST::HTTPDData.CreateHost( row["KEY"] || "", @@ -603,6 +601,18 @@ end end + # Every YaST::HTTPDData.CreateHost resets the NameVirtualHost + # entry in default-server.conf. I do not really know the + # reason for, but in that case it is not intent (schubi). + # So, the default server will be modified AFTER all other + # hosts have been created to get the correct NameVirtualHost entry + if default_server + YaST::HTTPDData.ModifyHost( + default_server["KEY"], + default_server["VALUE"] || [] + ) + end + # setup service if Builtins.haskey(s, "service") YaST::HTTPDData.ModifyService(Ops.get_boolean(s, "service", false)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.2/src/modules/YaPI/HTTPD.pm new/yast2-http-server-3.1.3/src/modules/YaPI/HTTPD.pm --- old/yast2-http-server-3.1.2/src/modules/YaPI/HTTPD.pm 2014-08-29 15:09:10.000000000 +0200 +++ new/yast2-http-server-3.1.3/src/modules/YaPI/HTTPD.pm 2014-09-09 10:49:22.000000000 +0200 @@ -499,8 +499,8 @@ } if ($ip eq '' && $byname eq ''){ - $ip = $params->{'id'}; - if ($params->{'type'} eq "ip-based"){ + $ip = $params->{'id'} if defined($params->{'type'}); + if (defined($params->{'type'}) && $params->{'type'} eq "ip-based"){ $byname = "0"; } else { $byname = "1"; @@ -565,11 +565,11 @@ sub validateNVH (){ my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ - if(($key ne 'ip-based') && ($key ne 'main')){ + if(($key ne 'ip-based') && ($key ne 'main')){ my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; - $nb{$host_ip}=1; + $nb{$host_ip}=1 if ($host_ip); } - } + } my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.2/src/modules/YaST/HTTPDData.pm new/yast2-http-server-3.1.3/src/modules/YaST/HTTPDData.pm --- old/yast2-http-server-3.1.2/src/modules/YaST/HTTPDData.pm 2014-08-29 15:09:10.000000000 +0200 +++ new/yast2-http-server-3.1.3/src/modules/YaST/HTTPDData.pm 2014-09-09 10:49:22.000000000 +0200 @@ -578,7 +578,7 @@ my ($ip, $fp, $tp, $port) = ('', '', '', ''); # if ( $new =~ m/\[([\w\W]*)\]/; #){ - $ip=$1; + $ip=$1 if ($1); if ($new =~ m/\[$ip\]:([\d\:]*)/){ ($fp, $tp) = split(/:/, $1); } else{ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
