Author: jsrain Date: Fri Feb 25 14:01:52 2011 New Revision: 63481 URL: http://svn.opensuse.org/viewcvs/yast?rev=63481&view=rev Log: fixed server flags handling (bnc#656589) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP1-Branch/http-server/src/YaST/HTTPDData.pm 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=63481&r1=63480&r2=63481&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 Fri Feb 25 14:01:52 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 25 13:53:54 CET 2011 - jsrain@suse.cz + +- fixed server flags handling (bnc#656589) + +------------------------------------------------------------------- Wed Mar 25 14:06:28 CET 2009 - mzugec@suse.cz - for name-based vhosts split configuration files (bnc#427427) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaST/HTTPDData.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-server/src/YaST/HTTPDData.pm?rev=63481&r1=63480&r2=63481&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaST/HTTPDData.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaST/HTTPDData.pm Fri Feb 25 14:01:52 2011 @@ -419,8 +419,26 @@ my $use_ssl = 0; foreach( @{GetModuleList()} ){ $use_ssl = 1 if /^ssl$/ } - if ($use_ssl == 1) {YaPI::HTTPD->SetServerFlags("SSL");} - else {YaPI::HTTPD->SetServerFlags("");} + my @flags = split(' ', YaPI::HTTPD->GetServerFlags()); + my $flags_have_ssl = 0; + @flags = grep { + if ($_ eq "SSL") { + if ($use_ssl) { + $flags_have_ssl = 1; + } else { + 0; + } + } else { + 1; + } + } @flags; + + if ($use_ssl == 1 && $flags_have_ssl == 0) { + push @flags, "SSL" + } + + YaPI::HTTPD->SetServerFlags(join(" ", @flags)); + return 1; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org