1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/xmlrpc/client.rb: use "" instead of "." if prefix argument is

nil in proxy methods. nil is default value.

* test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
  use threads instead of forking. this should fix issue #1208
  (http://rubyforge.org/tracker/?func=detail&atid=1698&aid=1208&group_id=426).
  removed testing of SSL enabled servlet as this hangs.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mneumann 2004-12-21 16:23:33 +00:00
parent d1be7e2cd3
commit e537aaba91
4 changed files with 32 additions and 21 deletions

View file

@ -7,20 +7,20 @@ module WEBrick_Testing
end
def start_server(config={})
raise "already started" if @__server_pid or @__started
trap('HUP') { @__started = true }
@__server_pid = fork do
w = WEBrick::HTTPServer.new(
raise "already started" if @__server
@__started = false
Thread.new {
@__server = WEBrick::HTTPServer.new(
{
:Logger => DummyLog.new,
:AccessLog => [],
:StartCallback => proc { Process.kill('HUP', Process.ppid) }
:StartCallback => proc { @__started = true }
}.update(config))
yield w
trap('INT') { w.shutdown }
w.start
exit
end
yield @__server
@__server.start
@__started = false
}
Timeout.timeout(5) {
nil until @__started # wait until the server is ready
@ -28,10 +28,10 @@ module WEBrick_Testing
end
def stop_server
Process.kill('INT', @__server_pid)
@__server_pid = nil
@__started = false
Process.wait
raise unless $?.success?
Timeout.timeout(5) {
@__server.shutdown
nil while @__started # wait until the server is down
}
@__server = nil
end
end