back out of non-blocking Socket#accept

1 files changed, 8 insertions, 13 deletions

diff --git a/script/git-daemon b/script/git-daemon
index b9482d5..74d789a 100755
--- a/script/git-daemon
+++ b/script/git-daemon
@@ -43,20 +43,15 @@ module Git
     end
       
     def run
-      begin
-        while session = @socket.accept_nonblock
-          connections = $children_active - $children_reaped
-          if connections > MAX_CHILDREN
-            log(Process.pid, "too many active children #{connections}/#{MAX_CHILDREN}")
-            session.close
-            next
-          end
-          
-          run_service(session)
+      while session = @socket.accept
+        connections = $children_active - $children_reaped
+        if connections > MAX_CHILDREN
+          log(Process.pid, "too many active children #{connections}/#{MAX_CHILDREN}")
+          session.close
+          next
         end
-      rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO, Errno::EINTR
-        IO.select([@socket])
-        retry
+        
+        run_service(session)
       end
     end