[vlc-commits] luarc: end remotely closed connections
Pierre Ynard
git at videolan.org
Wed Feb 2 00:56:31 CET 2011
vlc/vlc-1.1 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Tue Feb 1 23:11:23 2011 +0100| [70da8d743d9c008473019076b868bb720c7c8115] | committer: Pierre Ynard
luarc: end remotely closed connections
Fix a busy loop and socket leak. Thanks to Santiago Gimeno for
pointing it out (Debian bug #607869)
(cherry picked from commit 8e49d55a31f2e96d56e0c65e49b25c4c45589ea6)
Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=70da8d743d9c008473019076b868bb720c7c8115
---
share/lua/intf/rc.lua | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/share/lua/intf/rc.lua b/share/lua/intf/rc.lua
index 1690da8..f4c0acf 100644
--- a/share/lua/intf/rc.lua
+++ b/share/lua/intf/rc.lua
@@ -695,9 +695,8 @@ while not vlc.misc.should_die() do
if string.match(input,"\n$") then
client.buffer = string.gsub(client.buffer..input,"\r?\n$","")
done = true
- elseif client.buffer == ""
- and ((client.type == host.client_type.stdio and input == "")
- or (client.type == host.client_type.net and input == "\004")) then
+ elseif input == ""
+ or (client.type == host.client_type.net and input == "\004") then
-- Caught a ^D
client.buffer = "quit"
done = true
More information about the vlc-commits
mailing list