michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jamie Cameron
2021-11-21 15:37:52 -08:00
parent 29d1f48ae7 55d286ee4c
commit 186786978f
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apache/core.pl
View File

@@ -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) ] );
}
}

11
apache/lang/en
View File

@@ -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

12
web-lib-funcs.pl
View File

@@ -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).