diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-07 11:05:22 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-07 11:05:22 +0000 |
commit | 36c839f233cf77d4992bedc2a26f35b5529eb389 (patch) | |
tree | b30a56334373e885a5336b7966c6491c9b53a058 /test/webrick/utils.rb | |
parent | fe1019c6659b5f628c751d289e73456e1da2313f (diff) | |
download | ruby-36c839f233cf77d4992bedc2a26f35b5529eb389.tar.gz |
* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
should delete trailing LF from the result of pack("m*").
* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
- should delete trailing LF from the result of pack("m*").
- clear Request-Line not to send the sesponse by HTTPServer#run.
* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
refine regexp (and change the name of a local variable).
* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
don't allow changing its mode.
* test/webrick/*, sample/webrick/httpproxy.rb: add new files.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick/utils.rb')
-rw-r--r-- | test/webrick/utils.rb | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb new file mode 100644 index 0000000000..50ffd759aa --- /dev/null +++ b/test/webrick/utils.rb @@ -0,0 +1,36 @@ +require "webrick" +require "webrick/httpproxy" + +module TestWEBrick + NullWriter = Object.new + def NullWriter.<<(msg) + puts msg if $DEBUG + return self + end + + module_function + + def start_server(klass, config={}, &block) + server = klass.new({ + :BindAddress => "127.0.0.1", :Port => 0, + :Logger => WEBrick::Log.new(NullWriter), + :AccessLog => [[NullWriter, ""]] + }.update(config)) + begin + thread = Thread.start{ server.start } + addr = server.listeners[0].addr + block.call([server, addr[3], addr[1]]) + ensure + server.stop + thread.join + end + end + + def start_httpserver(config={}, &block) + start_server(WEBrick::HTTPServer, config, &block) + end + + def start_httpproxy(config={}, &block) + start_server(WEBrick::HTTPProxyServer, config, &block) + end +end |