X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=b3816df3f324ade51480e1f65d4105cc13d13b6b;hb=3c0c1870d27827056e62012828bc7233abde1f01;hp=d067f27e31c35ee2fec876577a345eb2fb7a274b;hpb=5947a205b3f36462fc1fe5ed5a08c7d8293ab744;p=spider.git diff --git a/perl/Msg.pm b/perl/Msg.pm index d067f27e..b3816df3 100644 --- a/perl/Msg.pm +++ b/perl/Msg.pm @@ -89,7 +89,7 @@ sub _enqueue { my ($conn, $msg) = @_; # prepend length (encoded as network long) my $len = length($msg); - $msg =~ s/(\x00-\x2f\x7e-\xff%])/sprintf("%%%02X", ord($1))/eg; + $msg =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; push (@{$conn->{queue}}, $msg . "\n"); } @@ -128,6 +128,7 @@ sub _send { } else { # Uh, oh delete $conn->{send_offset}; $conn->handle_send_err($!); + $conn->disconnect; return 0; # fail. Message remains in queue .. } } @@ -231,9 +232,10 @@ sub _rcv { # Complement to _send } FINISH: - if (defined $bytes_read == 0) { - $conn->disconnect(); + if (defined $bytes_read && $bytes_read == 0) { +# $conn->disconnect(); &{$conn->{rcvd_notification_proc}}($conn, undef, $!); + @lines = (); } while (@lines){