[vlc-commits] Revert "lua: fix a busy loop (fix #4165)"

[Pierre Ynard]

vlc/vlc-1.1 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Tue Feb  1 22:53:03 2011 +0100| [2477116bf1124875d6a1915c9bb50c1101474c8e] | committer: Pierre Ynard

Revert "lua: fix a busy loop (fix #4165)"

This reverts commit a1b3978d280993a87033ee3de22b08d6dad9544f.

It doesn't fix anything and it breaks new connections

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
(cherry picked from commit c4e65e386a753aef5d9954b2dc280056b8682e4b)

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=2477116bf1124875d6a1915c9bb50c1101474c8e
---

 share/lua/intf/modules/host.lua |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/share/lua/intf/modules/host.lua b/share/lua/intf/modules/host.lua
index 7d0c404..4601b25 100644
--- a/share/lua/intf/modules/host.lua
+++ b/share/lua/intf/modules/host.lua
@@ -235,7 +235,6 @@ function host()
         filter_client( pollfds, status.read, vlc.net.POLLIN )
         filter_client( pollfds, status.password, vlc.net.POLLIN )
         filter_client( pollfds, status.write, vlc.net.POLLOUT )
-
         if listeners.tcp then
             for _, listener in pairs(listeners.tcp.list) do
                 for _, fd in pairs({listener:fds()}) do
@@ -251,10 +250,9 @@ function host()
             for _, client in pairs(clients) do
                 if pollfds[client:fd()] == vlc.net.POLLOUT then
                     table.insert(wclients,client)
-                elseif pollfds[client:fd()] == vlc.net.POLLIN then
+                end
+                if pollfds[client:fd()] == vlc.net.POLLIN then
                     table.insert(rclients,client)
-                else
-                    del_client( client )
                 end
             end
             if listeners.tcp then