summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/gserver.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a6331373776..eeaba4e165d 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 f6f37d3a895..8eac2a2fed3 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)