From 1d23123c46caafa039343a1da0b5e8fb25f49f93 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 2 Feb 2013 04:13:33 +0000
Subject: [PATCH] * lib/gserver.rb (GServer#start): fix a timing issue.  patch
 from   Charles Nutter.  [Bug #7081]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 lib/gserver.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a633137377..eeaba4e165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb  2 13:00:11 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/gserver.rb (GServer#start): fix a timing issue.  patch from
+	  Charles Nutter.  [Bug #7081]
+
 Sat Feb  2 12:36:54 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* lib/fileutils.rb (copy_entry, wrap_traverse): preserve attributes of
diff --git a/lib/gserver.rb b/lib/gserver.rb
index f6f37d3a89..8eac2a2fed 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -261,7 +261,8 @@ class GServer
              end
           }
           client = @tcpServer.accept
-          @connections << Thread.new(client)  { |myClient|
+          Thread.new(client)  { |myClient|
+            @connections << Thread.current
             begin
               myPort = myClient.peeraddr[1]
               serve(myClient) if !@audit or connecting(myClient)