* 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: http://svn.ruby-lang.org/repos/ruby/trunk@7743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 65 insertions, 0 deletions

diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
new file mode 100644
index 000000000..703fde4d9
--- /dev/null
+++ b/test/webrick/test_filehandler.rb
@@ -0,0 +1,65 @@
+require "test/unit"
+require "webrick"
+require "stringio"
+
+class WEBrick::TestFileHandler < Test::Unit::TestCase
+  def default_file_handler(filename)
+    klass = WEBrick::HTTPServlet::DefaultFileHandler
+    klass.new(WEBrick::Config::HTTP, filename)
+  end
+
+  def get_res_body(res)
+    return res.body.read rescue res.body
+  end
+
+  def make_range_request(range_spec)
+    msg = <<-_end_of_request_
+      GET / HTTP/1.0
+      Range: #{range_spec}
+
+    _end_of_request_
+    return StringIO.new(msg.gsub(/^ {6}/, ""))
+  end
+
+  def make_range_response(file, range_spec)
+    req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
+    req.parse(make_range_request(range_spec))
+    res = WEBrick::HTTPResponse.new(WEBrick::Config::HTTP)
+    size = File.size(file)
+    handler = default_file_handler(file)
+    handler.make_partial_content(req, res, file, size)
+    return res
+  end
+
+  def test_make_partial_content
+    filename = __FILE__
+    filesize = File.size(filename)
+
+    res = make_range_response(filename, "bytes=#{filesize-100}-")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=-100")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=0-99")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=100-199")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 100)
+
+    res = make_range_response(filename, "bytes=0-0")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 1)
+
+    res = make_range_response(filename, "bytes=-1")
+    assert_match(%r{^text/plain}, res["content-type"])
+    assert_equal(get_res_body(res).size, 1)
+
+    res = make_range_response(filename, "bytes=0-0, -2")
+    assert_match(%r{^multipart/byteranges}, res["content-type"])
+  end
+end