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

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

Browse Source
This commit is contained in:
Jamie Cameron
2022-10-26 09:06:58 -07:00
parent 7064fc4708 29960cfe92
commit a1b497dc72
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xterm/lang/en
View File

@@ -1,5 +1,5 @@
index_title=Interactive Shell
index_cpan=The Perl module <tt>$1</tt> needed to accept Websockets connections is not available, but you can install it automatically using Webmin's <a href='$2'>Perl Modules</a> module.
index_cpan=The Perl module <tt>$1</tt> needed to accept WebSockets connections is not available, but you can install it automatically using Webmin's <a href='$2'>Perl Modules</a> module.
index_euser=User $1 to run the shell as does not exist!
acl_user=Run shell as Unix user

12
xterm/shellserver.pl
View File

@@ -38,7 +38,7 @@ Net::WebSocket::Server->new(
print STDERR "got websockets connection\n";
if ($wsconn) {
print STDERR "Too many connections to the same port!\n";
&cleanup_miniserv();
&cleanup_miniserv();
kill('KILL', $pid) if ($pid);
exit(1);
}
@@ -69,7 +69,7 @@ Net::WebSocket::Server->new(
},
disconnect => sub {
print STDERR "websocket connection closed\n";
&cleanup_miniserv();
&cleanup_miniserv();
kill('KILL', $pid) if ($pid);
exit(0);
}
@@ -80,10 +80,10 @@ Net::WebSocket::Server->new(
# Got something from the shell
my $buf;
my $ok = sysread($shellfh, $buf, 1);
if ($ok <= 0) {
&cleanup_miniserv();
exit(0);
}
if ($ok <= 0) {
&cleanup_miniserv();
exit(0);
}
if ($wsconn) {
$wsconn->send_binary($buf);
}