diff options
-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
@@ -15,6 +15,14 @@ require "net/http" Net::HTTP::version_1_2 if RUBY_VERSION < "1.7" module WEBrick 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*") 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*") end host, port = proxy.host, proxy.port end @@ -211,6 +221,10 @@ module WEBrick end res.send_response(ua) access_log(@config, req, res) end begin @@ -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] q = (m[2] or 1).to_f - tmp.push([lang, q]) end } - tmp = tmp.sort_by{|lang, q| -q} - tmp.collect!{|lang, q| lang} end return tmp end @@ -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+") - } yield if block_given? end end |