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 /lib/webrick | |
parent | fe1019c6659b5f628c751d289e73456e1da2313f (diff) |
* 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 'lib/webrick')
-rw-r--r-- | lib/webrick/httpproxy.rb | 14 | ||||
-rw-r--r-- | lib/webrick/httputils.rb | 10 | ||||
-rw-r--r-- | lib/webrick/server.rb | 6 |
3 files changed, 22 insertions, 8 deletions
diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index c5ed44f1da..14e3499775 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -15,6 +15,14 @@ require "net/http" Net::HTTP::version_1_2 if RUBY_VERSION < "1.7" module WEBrick + NullReader = Object.new + class << NullReader + def read(*args) + nil + end + alias gets read + end + class HTTPProxyServer < HTTPServer def initialize(config) super @@ -111,6 +119,7 @@ module WEBrick proxy_port = proxy.port if proxy.userinfo credentials = "Basic " + [proxy.userinfo].pack("m*") + credentials.chomp! header['proxy-authorization'] = credentials end end @@ -171,6 +180,7 @@ module WEBrick proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0" if proxy.userinfo credentials = "Basic " + [proxy.userinfo].pack("m*") + credentials.chomp! end host, port = proxy.host, proxy.port end @@ -211,6 +221,10 @@ module WEBrick end res.send_response(ua) access_log(@config, req, res) + + # Should clear request-line not to send the sesponse twice. + # see: HTTPServer#run + req.parse(NullReader) rescue nil end begin diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index 18e3e25887..e45d8e0499 100644 --- a/lib/webrick/httputils.rb +++ b/lib/webrick/httputils.rb @@ -179,14 +179,14 @@ module WEBrick if value parts = value.split(/,\s*/) parts.each {|part| - if m = %r{^([^\s,]+?)(?:;\s*q=([\d]+(?:\.[\d]+)))?$}.match(part) - lang = m[1] + if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part) + val = m[1] q = (m[2] or 1).to_f - tmp.push([lang, q]) + tmp.push([val, q]) end } - tmp = tmp.sort_by{|lang, q| -q} - tmp.collect!{|lang, q| lang} + tmp = tmp.sort_by{|val, q| -q} + tmp.collect!{|val, q| val} end return tmp end diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 48d9fcd4ec..47ba4c700f 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -31,9 +31,9 @@ module WEBrick exit!(0) if fork Dir::chdir("/") File::umask(0) - [ STDIN, STDOUT, STDERR ].each{|io| - io.reopen("/dev/null", "r+") - } + STDIN.reopen("/dev/null") + STDOUT.reopen("/dev/null", "w") + STDERR.reopen("/dev/null", "w") yield if block_given? end end |