Merge branch 'master' of github.com:webmin/webmin

apache/mod_ssl.pl

@@ -37,10 +37,12 @@ return &parse_choice("SSLEngine");
 sub get_sslprotos
 {
 my @sslprotos = ("SSLv2", "SSLv3", "TLSv1" );
-if ($httpd_modules{'core'} >= 2.215) {
+my $ver = $httpd_modules{'core'};
+$ver =~ s/^(\d+)\.(\d)(\d+)$/$1.$2.$3/;
+if (&compare_version_numbers($ver, '2.2.15') >= 0) {
 	push(@sslprotos, "TLSv1.1", "TLSv1.2");
 	}
-if ($httpd_modules{'core'} >= 2.437) {
+if (&compare_version_numbers($ver, '2.4.37') >= 0) {
 	push(@sslprotos, "TLSv1.3");
 	}
 return @sslprotos;

gray-theme/unauthenticated/gray-virtual-server-style.css

@@ -179,3 +179,9 @@ div.wrapper {
   left: 4px;
   padding-top: 2px;
 }
+br[data-x-br] {
+  content: "";
+  margin: 2em;
+  display: block;
+  font-size: 42%;
+}

logrotate/force.cgi

@@ -12,8 +12,13 @@ print $text{'force_doing'},"\n";
 &clean_environment();
 $out = &backquote_logged("$config{'logrotate'} -f $config{'logrotate_conf'} 2>&1");
 &reset_environment();
-print "<pre>$out</pre>";
-if ($?) {
+if ($out) {
+	print "<pre>$out</pre>";
+	}
+else {
+	print "<br>";
+	}
+if ($? && $out) {
 	print $text{'force_failed'},"<br>\n";
 	}
 else {

ui-lib.pl

@@ -2710,5 +2710,18 @@ if ($page) {
 return $rv;
 }
 
+=head2 ui_line_break_double()
+
+Create double line break, with accessible second break
+
+=cut
+sub ui_line_break_double
+{
+if (defined(&theme_ui_line_break_double)) {
+	return &theme_ui_line_break_double(@_);
+	}
+return "<br><br data-x-br>\n";
+}
+
 1;