]>
git.proxmox.com Git - pve-client.git/commitdiff
projects
/
pve-client.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
48e35b7
)
lxc enter: fix read from non-blocking web socket
author
Dietmar Maurer
<dietmar@proxmox.com>
Fri, 8 Jun 2018 08:20:21 +0000
(10:20 +0200)
committer
Dietmar Maurer
<dietmar@proxmox.com>
Fri, 8 Jun 2018 09:42:22 +0000
(11:42 +0200)
PVE/APIClient/Commands/lxc.pm
patch
|
blob
|
blame
|
history
diff --git
a/PVE/APIClient/Commands/lxc.pm
b/PVE/APIClient/Commands/lxc.pm
index 6c9603abf17b652dc0b44da6738c127766774410..879d7c32981023fa2a3a85325ecc088e4fd68c08 100644
(file)
--- a/
PVE/APIClient/Commands/lxc.pm
+++ b/
PVE/APIClient/Commands/lxc.pm
@@
-202,7
+202,9
@@
__PACKAGE__->register_method ({
my $wb_socket_read_available_bytes = sub {
my $nr = $web_socket->sysread($wsbuf, $max_payload_size, length($wsbuf));
- die "web socket read error - $!\n" if $nr < 0;
+ if (!defined($nr) && !($! == EINTR || $! == EAGAIN)) {
+ die "web socket read error - $!\n";
+ }
return $nr;
};
@@
-318,7
+320,7
@@
__PACKAGE__->register_method ({
my $nr = $wb_socket_read_available_bytes->();
if (!defined($nr)) {
- die "web socket read error $!\n";
+ # wait
} elsif ($nr == 0) {
return; # EOF
} else {