diff --git a/apache/core.pl b/apache/core.pl
index 5e0bd08d4..2f32c4e44 100755
--- a/apache/core.pl
+++ b/apache/core.pl
@@ -638,6 +638,7 @@ if ($in{'protocols_def'}) {
 else {
 	my @prots = split(/\0/, $in{'protocols'});
 	@prots || &error($text{'core_eprotocols'});
+	@prots = sort @prots;
 	return ( [ join(" ", @prots) ] );
 	}
 }
diff --git a/apache/lang/en b/apache/lang/en
index cc1473ed7..4e73dc097 100644
--- a/apache/lang/en
+++ b/apache/lang/en
@@ -385,11 +385,12 @@ core_altnames=Alternate virtual server names
 core_hostname=Server hostname
 core_virtaddr=Addresses for name virtual servers
 core_virtaddr_star=Include all addresses
-core_protocols=HTTP protocols to accept
-core_protocols_sel=Selected protocols :
-core_protocols_http/1.1=HTTP 1.1
-core_protocols_h2=HTTP2 encrypted
-core_protocols_h2c=HTTP2 unencrypted
+core_protocols=HTTP protocols to use
+core_protocols_sel=Selected protocols:
+core_protocols_http/1.1=HTTP/1.1
+core_protocols_http/2=HTTP/2
+core_protocols_h2=HTTP/2 encrypted
+core_protocols_h2c=HTTP/2 unencrypted
 core_eprotcols=No protocols selected!
 core_ekeeptout=Keep-alive timeout must be an integer
 core_elqueue=Listen queue length must be an integer
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index daa3f9c87..8cdfff920 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -7078,6 +7078,12 @@ if ($gconfig{'os_type'} eq 'windows') {
 		$err = $out;
 		}
 	}
+elsif (-l $src && !$copylink) {
+	# A link .. re-create
+	my $linkdst = readlink($src);
+	$ok = &symlink_logged($linkdst, $dst);
+	$err = $ok ? undef : $!;
+	}
 elsif (-d $src) {
 	# A directory .. need to copy with tar command
 	my @st = stat($src);
@@ -7090,12 +7096,6 @@ elsif (-d $src) {
 		$err = $out;
 		}
 	}
-elsif (-l $src && !$copylink) {
-	# A link .. re-create
-	my $linkdst = readlink($src);
-	$ok = &symlink_logged($linkdst, $dst);
-	$err = $ok ? undef : $!;
-	}
 else {
 	# Can just copy with cp
 	my $out = &backquote_logged("cp -p ".quotemeta($src).