summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-04 19:09:56 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-04 19:09:56 +0000
commit1355933d89ffbef59b09a9ab9100720b0ad9dce5 (patch)
tree768b8e79ebb0b5ddb08c06f55dacb3d12b56a706
parentab3dde0da35e02b61818cf210b0e3a5089160102 (diff)
* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
of "join". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/xmlrpc/server.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed1d78ff16..f2da0d2df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 05 04:06:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
+ of "join".
+
Sat Oct 1 23:55:24 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (do_select, rb_w32_select): brush up.
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index 788abc2d59..06a0d02c8b 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -645,7 +645,7 @@ class Server < WEBrickServlet
end
trap(signal) { @server.shutdown }
- @server.start.join
+ @server.start
end
def shutdown