Mailinglist Archive: yast-commit (214 mails)

[locilka@xxxxxxxxxxxxxxxxx]

Author: locilka
Date: Tue Feb  7 11:55:37 2012
New Revision: 67373

URL: http://svn.opensuse.org/viewcvs/yast?rev=67373&view=rev
Log:
Getting SP1 into the same state as SP2 - not wanted to maintain more
than one version in SLE 11

- Especially fixed bug with NameVirtualHost (bnc#486475)


Modified:
    branches/SuSE-Code-11-SP1-Branch/http-server/VERSION
    
branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes
    branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm
    branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop

Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/VERSION?rev=67373&r1=67372&r2=67373&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/http-server/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/http-server/VERSION Tue Feb  7 11:55:37 
2012
@@ -1 +1 @@
-2.17.11
+2.17.14

Modified: 
branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes?rev=67373&r1=67372&r2=67373&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes 
(original)
+++ 
branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes 
Tue Feb  7 11:55:37 2012
@@ -1,7 +1,20 @@
 -------------------------------------------------------------------
+Tue Feb  7 11:45:02 UTC 2012 - locilka@xxxxxxx
+
+- Backported a real fix for NameVirtualHost from trunk (bnc#486475)
+- 2.17.14
+
+-------------------------------------------------------------------
+Thu Dec 22 09:39:32 UTC 2011 - jsrain@xxxxxxx
+
+- removed superfluous spaces from .desktop-file (bnc#712052)
+- 2.17.13
+
+-------------------------------------------------------------------
 Fri Feb 25 13:53:54 CET 2011 - jsrain@xxxxxxx
 
 - fixed server flags handling (bnc#656589)
+- 2.17.12
 
 -------------------------------------------------------------------
 Wed Mar 25 14:06:28 CET 2009 - mzugec@xxxxxxx

Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm?rev=67373&r1=67372&r2=67373&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm (original)
+++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb  7 
11:55:37 2012
@@ -538,6 +538,7 @@
 #   $vhost_files->{$ip} = @newdata;
 #  }
 
+ $self->validateNVH();
 }
 
 
@@ -588,29 +589,28 @@
 #              push(@newdata, $row);
 #      }
 # }
-my $params = $self->getVhType($hostid);
-
- $self->deleteVH($hostid);
- $self->createVH($hostid, $data, $params);
- $self->validateNVH();
+    my $params = $self->getVhType($hostid);
 
+    $self->deleteVH($hostid);
+    $self->createVH($hostid, $data, $params);
 }
 
 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');
+   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} );
  }
 

Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop?rev=67373&r1=67372&r2=67373&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Tue 
Feb  7 11:55:37 2012
@@ -16,7 +16,7 @@
 X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstResource=http-server
 X-SuSE-YaST-AutoInstClonable=true
-X-SuSE-YaST-AutoInstSchema = http-server.rnc
+X-SuSE-YaST-AutoInstSchema=http-server.rnc
 
 Icon=yast-http-server
 Exec=/sbin/yast2 http-server 

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx