2015-12-16 00:07:31 -05:00
|
|
|
# frozen_string_literal: false
|
2005-01-07 06:05:22 -05:00
|
|
|
require "test/unit"
|
|
|
|
require "net/http"
|
|
|
|
require "webrick"
|
2010-02-02 08:58:56 -05:00
|
|
|
require_relative "utils"
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
class TestWEBrickHTTPServer < Test::Unit::TestCase
|
2014-11-08 10:38:33 -05:00
|
|
|
empty_log = Object.new
|
|
|
|
def empty_log.<<(str)
|
|
|
|
assert_equal('', str)
|
|
|
|
self
|
|
|
|
end
|
|
|
|
NoLog = WEBrick::Log.new(empty_log, WEBrick::BasicLog::WARN)
|
|
|
|
|
2016-01-05 01:09:17 -05:00
|
|
|
def teardown
|
|
|
|
WEBrick::Utils::TimeoutHandler.terminate
|
|
|
|
super
|
|
|
|
end
|
|
|
|
|
2005-01-07 06:05:22 -05:00
|
|
|
def test_mount
|
|
|
|
httpd = WEBrick::HTTPServer.new(
|
2014-11-08 10:38:33 -05:00
|
|
|
:Logger => NoLog,
|
2005-01-07 06:05:22 -05:00
|
|
|
:DoNotListen=>true
|
|
|
|
)
|
|
|
|
httpd.mount("/", :Root)
|
|
|
|
httpd.mount("/foo", :Foo)
|
|
|
|
httpd.mount("/foo/bar", :Bar, :bar1)
|
|
|
|
httpd.mount("/foo/bar/baz", :Baz, :baz1, :baz2)
|
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/")
|
|
|
|
assert_equal(:Root, serv)
|
|
|
|
assert_equal([], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("", script_name)
|
|
|
|
assert_equal("/", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/sub")
|
|
|
|
assert_equal(:Root, serv)
|
|
|
|
assert_equal([], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("", script_name)
|
|
|
|
assert_equal("/sub", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/sub/")
|
|
|
|
assert_equal(:Root, serv)
|
|
|
|
assert_equal([], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("", script_name)
|
|
|
|
assert_equal("/sub/", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/foo")
|
|
|
|
assert_equal(:Foo, serv)
|
|
|
|
assert_equal([], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("/foo", script_name)
|
|
|
|
assert_equal("", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/foo/")
|
|
|
|
assert_equal(:Foo, serv)
|
|
|
|
assert_equal([], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("/foo", script_name)
|
|
|
|
assert_equal("/", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/foo/sub")
|
|
|
|
assert_equal(:Foo, serv)
|
|
|
|
assert_equal([], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("/foo", script_name)
|
|
|
|
assert_equal("/sub", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar")
|
|
|
|
assert_equal(:Bar, serv)
|
|
|
|
assert_equal([:bar1], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("/foo/bar", script_name)
|
|
|
|
assert_equal("", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
serv, opts, script_name, path_info = httpd.search_servlet("/foo/bar/baz")
|
|
|
|
assert_equal(:Baz, serv)
|
|
|
|
assert_equal([:baz1, :baz2], opts)
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal("/foo/bar/baz", script_name)
|
|
|
|
assert_equal("", path_info)
|
2005-01-07 06:05:22 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
class Req
|
|
|
|
attr_reader :port, :host
|
|
|
|
def initialize(addr, port, host)
|
|
|
|
@addr, @port, @host = addr, port, host
|
|
|
|
end
|
|
|
|
def addr
|
|
|
|
[0,0,0,@addr]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def httpd(addr, port, host, ali)
|
|
|
|
config ={
|
2014-11-08 10:38:33 -05:00
|
|
|
:Logger => NoLog,
|
2005-01-07 06:05:22 -05:00
|
|
|
:DoNotListen => true,
|
|
|
|
:BindAddress => addr,
|
|
|
|
:Port => port,
|
|
|
|
:ServerName => host,
|
|
|
|
:ServerAlias => ali,
|
|
|
|
}
|
|
|
|
return WEBrick::HTTPServer.new(config)
|
|
|
|
end
|
|
|
|
|
|
|
|
def assert_eql?(v1, v2)
|
|
|
|
assert_equal(v1.object_id, v2.object_id)
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_lookup_server
|
|
|
|
addr1 = "192.168.100.1"
|
|
|
|
addr2 = "192.168.100.2"
|
|
|
|
addrz = "192.168.100.254"
|
|
|
|
local = "127.0.0.1"
|
|
|
|
port1 = 80
|
|
|
|
port2 = 8080
|
|
|
|
port3 = 10080
|
|
|
|
portz = 32767
|
|
|
|
name1 = "www.example.com"
|
|
|
|
name2 = "www2.example.com"
|
|
|
|
name3 = "www3.example.com"
|
|
|
|
namea = "www.example.co.jp"
|
|
|
|
nameb = "www.example.jp"
|
|
|
|
namec = "www2.example.co.jp"
|
|
|
|
named = "www2.example.jp"
|
|
|
|
namez = "foobar.example.com"
|
|
|
|
alias1 = [namea, nameb]
|
|
|
|
alias2 = [namec, named]
|
|
|
|
|
|
|
|
host1 = httpd(nil, port1, name1, nil)
|
|
|
|
hosts = [
|
|
|
|
host2 = httpd(addr1, port1, name1, nil),
|
|
|
|
host3 = httpd(addr1, port1, name2, alias1),
|
|
|
|
host4 = httpd(addr1, port2, name1, nil),
|
|
|
|
host5 = httpd(addr1, port2, name2, alias1),
|
2012-04-07 19:41:27 -04:00
|
|
|
httpd(addr1, port2, name3, alias2),
|
2005-01-07 06:05:22 -05:00
|
|
|
host7 = httpd(addr2, nil, name1, nil),
|
|
|
|
host8 = httpd(addr2, nil, name2, alias1),
|
2012-04-07 19:41:27 -04:00
|
|
|
httpd(addr2, nil, name3, alias2),
|
2005-01-07 06:05:22 -05:00
|
|
|
host10 = httpd(local, nil, nil, nil),
|
|
|
|
host11 = httpd(nil, port3, nil, nil),
|
|
|
|
].sort_by{ rand }
|
|
|
|
hosts.each{|h| host1.virtual_host(h) }
|
|
|
|
|
|
|
|
# connect to addr1
|
|
|
|
assert_eql?(host2, host1.lookup_server(Req.new(addr1, port1, name1)))
|
|
|
|
assert_eql?(host3, host1.lookup_server(Req.new(addr1, port1, name2)))
|
|
|
|
assert_eql?(host3, host1.lookup_server(Req.new(addr1, port1, namea)))
|
|
|
|
assert_eql?(host3, host1.lookup_server(Req.new(addr1, port1, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, port1, namez)))
|
|
|
|
assert_eql?(host4, host1.lookup_server(Req.new(addr1, port2, name1)))
|
|
|
|
assert_eql?(host5, host1.lookup_server(Req.new(addr1, port2, name2)))
|
|
|
|
assert_eql?(host5, host1.lookup_server(Req.new(addr1, port2, namea)))
|
|
|
|
assert_eql?(host5, host1.lookup_server(Req.new(addr1, port2, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, port2, namez)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addr1, port3, name1)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addr1, port3, name2)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addr1, port3, namea)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addr1, port3, nameb)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addr1, port3, namez)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, portz, name1)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, portz, name2)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, portz, namea)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, portz, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr1, portz, namez)))
|
|
|
|
|
|
|
|
# connect to addr2
|
|
|
|
assert_eql?(host7, host1.lookup_server(Req.new(addr2, port1, name1)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port1, name2)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port1, namea)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port1, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr2, port1, namez)))
|
|
|
|
assert_eql?(host7, host1.lookup_server(Req.new(addr2, port2, name1)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port2, name2)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port2, namea)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port2, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr2, port2, namez)))
|
|
|
|
assert_eql?(host7, host1.lookup_server(Req.new(addr2, port3, name1)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port3, name2)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port3, namea)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, port3, nameb)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addr2, port3, namez)))
|
|
|
|
assert_eql?(host7, host1.lookup_server(Req.new(addr2, portz, name1)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, portz, name2)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, portz, namea)))
|
|
|
|
assert_eql?(host8, host1.lookup_server(Req.new(addr2, portz, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addr2, portz, namez)))
|
|
|
|
|
|
|
|
# connect to addrz
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port1, name1)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port1, name2)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port1, namea)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port1, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port1, namez)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port2, name1)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port2, name2)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port2, namea)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port2, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, port2, namez)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, name1)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, name2)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, namea)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, nameb)))
|
|
|
|
assert_eql?(host11, host1.lookup_server(Req.new(addrz, port3, namez)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, portz, name1)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, portz, name2)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, portz, namea)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, portz, nameb)))
|
|
|
|
assert_eql?(nil, host1.lookup_server(Req.new(addrz, portz, namez)))
|
|
|
|
|
|
|
|
# connect to localhost
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port1, name1)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port1, name2)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port1, namea)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port1, nameb)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port1, namez)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port2, name1)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port2, name2)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port2, namea)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port2, nameb)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port2, namez)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port3, name1)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port3, name2)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port3, namea)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port3, nameb)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, port3, namez)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, portz, name1)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, portz, name2)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, portz, namea)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, portz, nameb)))
|
|
|
|
assert_eql?(host10, host1.lookup_server(Req.new(local, portz, namez)))
|
|
|
|
end
|
|
|
|
|
|
|
|
def test_callbacks
|
|
|
|
accepted = started = stopped = 0
|
|
|
|
requested0 = requested1 = 0
|
|
|
|
config = {
|
|
|
|
:ServerName => "localhost",
|
|
|
|
:AcceptCallback => Proc.new{ accepted += 1 },
|
|
|
|
:StartCallback => Proc.new{ started += 1 },
|
|
|
|
:StopCallback => Proc.new{ stopped += 1 },
|
|
|
|
:RequestCallback => Proc.new{|req, res| requested0 += 1 },
|
|
|
|
}
|
2014-11-09 09:01:20 -05:00
|
|
|
log_tester = lambda {|log, access_log|
|
|
|
|
assert(log.find {|s| %r{ERROR `/' not found\.} =~ s })
|
|
|
|
assert_equal([], log.reject {|s| %r{ERROR `/' not found\.} =~ s })
|
|
|
|
}
|
|
|
|
TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
|
2005-01-07 06:05:22 -05:00
|
|
|
vhost_config = {
|
|
|
|
:ServerName => "myhostname",
|
|
|
|
:BindAddress => addr,
|
|
|
|
:Port => port,
|
|
|
|
:DoNotListen => true,
|
2014-11-08 10:38:33 -05:00
|
|
|
:Logger => NoLog,
|
2005-01-07 06:05:22 -05:00
|
|
|
:AccessLog => [],
|
|
|
|
:RequestCallback => Proc.new{|req, res| requested1 += 1 },
|
|
|
|
}
|
|
|
|
server.virtual_host(WEBrick::HTTPServer.new(vhost_config))
|
|
|
|
|
2012-04-07 19:41:27 -04:00
|
|
|
Thread.pass while server.status != :Running
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 06:22:28 -05:00
|
|
|
sleep 1 if RubyVM::MJIT.enabled? # server.status behaves unexpectedly with --jit-wait
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal(1, started, log.call)
|
|
|
|
assert_equal(0, stopped, log.call)
|
|
|
|
assert_equal(0, accepted, log.call)
|
2005-01-07 06:05:22 -05:00
|
|
|
|
|
|
|
http = Net::HTTP.new(addr, port)
|
|
|
|
req = Net::HTTP::Get.new("/")
|
|
|
|
req["Host"] = "myhostname:#{port}"
|
2008-10-29 07:48:35 -04:00
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
2005-01-07 06:05:22 -05:00
|
|
|
req["Host"] = "localhost:#{port}"
|
2008-10-29 07:48:35 -04:00
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
|
|
|
assert_equal(6, accepted, log.call)
|
|
|
|
assert_equal(3, requested0, log.call)
|
|
|
|
assert_equal(3, requested1, log.call)
|
2005-01-07 06:05:22 -05:00
|
|
|
}
|
|
|
|
assert_equal(started, 1)
|
|
|
|
assert_equal(stopped, 1)
|
|
|
|
end
|
2011-01-11 19:37:12 -05:00
|
|
|
|
2012-04-07 17:50:34 -04:00
|
|
|
# This class is needed by test_response_io_with_chunked_set method
|
|
|
|
class EventManagerForChunkedResponseTest
|
|
|
|
def initialize
|
|
|
|
@listeners = []
|
|
|
|
end
|
|
|
|
def add_listener( &block )
|
|
|
|
@listeners << block
|
|
|
|
end
|
|
|
|
def raise_str_event( str )
|
|
|
|
@listeners.each{ |e| e.call( :str, str ) }
|
|
|
|
end
|
|
|
|
def raise_close_event()
|
|
|
|
@listeners.each{ |e| e.call( :cls ) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
def test_response_io_with_chunked_set
|
|
|
|
evt_man = EventManagerForChunkedResponseTest.new
|
|
|
|
t = Thread.new do
|
|
|
|
begin
|
|
|
|
config = {
|
|
|
|
:ServerName => "localhost"
|
|
|
|
}
|
|
|
|
TestWEBrick.start_httpserver(config) do |server, addr, port, log|
|
|
|
|
body_strs = [ 'aaaaaa', 'bb', 'cccc' ]
|
|
|
|
server.mount_proc( "/", ->( req, res ){
|
|
|
|
# Test for setting chunked...
|
|
|
|
res.chunked = true
|
|
|
|
r,w = IO.pipe
|
|
|
|
evt_man.add_listener do |type,str|
|
|
|
|
type == :cls ? ( w.close ) : ( w << str )
|
|
|
|
end
|
|
|
|
res.body = r
|
|
|
|
} )
|
|
|
|
Thread.pass while server.status != :Running
|
|
|
|
http = Net::HTTP.new(addr, port)
|
|
|
|
req = Net::HTTP::Get.new("/")
|
|
|
|
http.request(req) do |res|
|
|
|
|
i = 0
|
|
|
|
evt_man.raise_str_event( body_strs[i] )
|
|
|
|
res.read_body do |s|
|
|
|
|
assert_equal( body_strs[i], s )
|
|
|
|
i += 1
|
|
|
|
if i < body_strs.length
|
|
|
|
evt_man.raise_str_event( body_strs[i] )
|
|
|
|
else
|
|
|
|
evt_man.raise_close_event()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
assert_equal( body_strs.length, i )
|
|
|
|
end
|
|
|
|
end
|
|
|
|
rescue => err
|
|
|
|
flunk( 'exception raised in thread: ' + err.to_s )
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if t.join( 3 ).nil?
|
|
|
|
evt_man.raise_close_event()
|
|
|
|
flunk( 'timeout' )
|
|
|
|
if t.join( 1 ).nil?
|
|
|
|
Thread.kill t
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2011-06-21 08:58:37 -04:00
|
|
|
def test_response_io_without_chunked_set
|
|
|
|
config = {
|
|
|
|
:ServerName => "localhost"
|
|
|
|
}
|
2014-11-09 09:01:20 -05:00
|
|
|
log_tester = lambda {|log, access_log|
|
|
|
|
assert_equal(1, log.length)
|
|
|
|
assert_match(/WARN Could not determine content-length of response body./, log[0])
|
|
|
|
}
|
|
|
|
TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
|
2011-06-21 08:58:37 -04:00
|
|
|
server.mount_proc("/", lambda { |req, res|
|
|
|
|
r,w = IO.pipe
|
|
|
|
# Test for not setting chunked...
|
|
|
|
# res.chunked = true
|
|
|
|
res.body = r
|
|
|
|
w << "foo"
|
|
|
|
w.close
|
|
|
|
})
|
|
|
|
Thread.pass while server.status != :Running
|
|
|
|
http = Net::HTTP.new(addr, port)
|
|
|
|
req = Net::HTTP::Get.new("/")
|
|
|
|
req['Connection'] = 'Keep-Alive'
|
|
|
|
begin
|
2015-07-13 06:07:01 -04:00
|
|
|
Timeout.timeout(2) do
|
2011-06-21 08:58:37 -04:00
|
|
|
http.request(req){|res| assert_equal("foo", res.body) }
|
|
|
|
end
|
|
|
|
rescue Timeout::Error
|
2015-12-24 18:23:46 -05:00
|
|
|
flunk('corrupted response')
|
2011-06-21 08:58:37 -04:00
|
|
|
end
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2011-01-11 19:37:12 -05:00
|
|
|
def test_request_handler_callback_is_deprecated
|
|
|
|
requested = 0
|
|
|
|
config = {
|
|
|
|
:ServerName => "localhost",
|
|
|
|
:RequestHandler => Proc.new{|req, res| requested += 1 },
|
|
|
|
}
|
2014-11-09 09:01:20 -05:00
|
|
|
log_tester = lambda {|log, access_log|
|
|
|
|
assert_equal(2, log.length)
|
|
|
|
assert_match(/WARN :RequestHandler is deprecated, please use :RequestCallback/, log[0])
|
|
|
|
assert_match(%r{ERROR `/' not found\.}, log[1])
|
|
|
|
}
|
|
|
|
TestWEBrick.start_httpserver(config, log_tester){|server, addr, port, log|
|
2012-04-07 19:41:27 -04:00
|
|
|
Thread.pass while server.status != :Running
|
2011-01-11 19:37:12 -05:00
|
|
|
|
|
|
|
http = Net::HTTP.new(addr, port)
|
|
|
|
req = Net::HTTP::Get.new("/")
|
|
|
|
req["Host"] = "localhost:#{port}"
|
|
|
|
http.request(req){|res| assert_equal("404", res.code, log.call)}
|
|
|
|
assert_match(%r{:RequestHandler is deprecated, please use :RequestCallback$}, log.call, log.call)
|
|
|
|
}
|
2014-11-09 07:16:38 -05:00
|
|
|
assert_equal(1, requested)
|
2011-01-11 19:37:12 -05:00
|
|
|
end
|
2014-05-07 21:17:07 -04:00
|
|
|
|
|
|
|
def test_shutdown_with_busy_keepalive_connection
|
|
|
|
requested = 0
|
|
|
|
config = {
|
|
|
|
:ServerName => "localhost",
|
|
|
|
}
|
|
|
|
TestWEBrick.start_httpserver(config){|server, addr, port, log|
|
|
|
|
server.mount_proc("/", lambda {|req, res| res.body = "heffalump" })
|
|
|
|
Thread.pass while server.status != :Running
|
|
|
|
|
|
|
|
Net::HTTP.start(addr, port) do |http|
|
|
|
|
req = Net::HTTP::Get.new("/")
|
|
|
|
http.request(req){|res| assert_equal('Keep-Alive', res['Connection'], log.call) }
|
|
|
|
server.shutdown
|
|
|
|
begin
|
|
|
|
10.times {|n| http.request(req); requested += 1 }
|
|
|
|
rescue
|
|
|
|
# Errno::ECONNREFUSED or similar
|
|
|
|
end
|
|
|
|
end
|
|
|
|
}
|
|
|
|
assert_equal(0, requested, "Server responded to #{requested} requests after shutdown")
|
|
|
|
end
|
2017-12-12 19:38:08 -05:00
|
|
|
|
|
|
|
def test_cntrl_in_path
|
|
|
|
log_ary = []
|
|
|
|
access_log_ary = []
|
|
|
|
config = {
|
|
|
|
:Port => 0,
|
|
|
|
:BindAddress => '127.0.0.1',
|
|
|
|
:Logger => WEBrick::Log.new(log_ary, WEBrick::BasicLog::WARN),
|
|
|
|
:AccessLog => [[access_log_ary, '']],
|
|
|
|
}
|
|
|
|
s = WEBrick::HTTPServer.new(config)
|
|
|
|
s.mount('/foo', WEBrick::HTTPServlet::FileHandler, __FILE__)
|
|
|
|
th = Thread.new { s.start }
|
|
|
|
addr = s.listeners[0].addr
|
|
|
|
|
|
|
|
http = Net::HTTP.new(addr[3], addr[1])
|
|
|
|
req = Net::HTTP::Get.new('/notexist%0a/foo')
|
|
|
|
http.request(req) { |res| assert_equal('404', res.code) }
|
|
|
|
exp = %Q(ERROR `/notexist\\n/foo' not found.\n)
|
|
|
|
assert_equal 1, log_ary.size
|
2018-04-06 23:48:44 -04:00
|
|
|
assert_include log_ary[0], exp
|
2017-12-12 19:38:08 -05:00
|
|
|
ensure
|
|
|
|
s&.shutdown
|
|
|
|
th&.join
|
|
|
|
end
|
2018-03-28 04:06:23 -04:00
|
|
|
|
|
|
|
def test_gigantic_request_header
|
|
|
|
log_tester = lambda {|log, access_log|
|
|
|
|
assert_equal 1, log.size
|
2018-04-06 23:48:44 -04:00
|
|
|
assert_include log[0], 'ERROR headers too large'
|
2018-03-28 04:06:23 -04:00
|
|
|
}
|
|
|
|
TestWEBrick.start_httpserver({}, log_tester){|server, addr, port, log|
|
|
|
|
server.mount('/', WEBrick::HTTPServlet::FileHandler, __FILE__)
|
|
|
|
TCPSocket.open(addr, port) do |c|
|
|
|
|
c.write("GET / HTTP/1.0\r\n")
|
|
|
|
junk = -"X-Junk: #{' ' * 1024}\r\n"
|
2018-04-29 22:17:03 -04:00
|
|
|
assert_raise(Errno::ECONNRESET, Errno::EPIPE) do
|
2018-03-28 04:06:23 -04:00
|
|
|
loop { c.write(junk) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
}
|
|
|
|
end
|
2018-03-28 04:06:34 -04:00
|
|
|
|
|
|
|
def test_eof_in_chunk
|
|
|
|
log_tester = lambda do |log, access_log|
|
|
|
|
assert_equal 1, log.size
|
2018-04-06 23:48:44 -04:00
|
|
|
assert_include log[0], 'ERROR bad chunk data size'
|
2018-03-28 04:06:34 -04:00
|
|
|
end
|
|
|
|
TestWEBrick.start_httpserver({}, log_tester){|server, addr, port, log|
|
|
|
|
server.mount_proc('/', ->(req, res) { res.body = req.body })
|
|
|
|
TCPSocket.open(addr, port) do |c|
|
|
|
|
c.write("POST / HTTP/1.1\r\nHost: example.com\r\n" \
|
|
|
|
"Transfer-Encoding: chunked\r\n\r\n5\r\na")
|
|
|
|
c.shutdown(Socket::SHUT_WR) # trigger EOF in server
|
|
|
|
res = c.read
|
|
|
|
assert_match %r{\AHTTP/1\.1 400 }, res
|
|
|
|
end
|
|
|
|
}
|
|
|
|
end
|
2018-03-28 04:06:39 -04:00
|
|
|
|
|
|
|
def test_big_chunks
|
|
|
|
nr_out = 3
|
|
|
|
buf = 'big' # 3 bytes is bigger than 2!
|
|
|
|
config = { :InputBufferSize => 2 }.freeze
|
|
|
|
total = 0
|
|
|
|
all = ''
|
|
|
|
TestWEBrick.start_httpserver(config){|server, addr, port, log|
|
|
|
|
server.mount_proc('/', ->(req, res) {
|
|
|
|
err = []
|
|
|
|
ret = req.body do |chunk|
|
|
|
|
n = chunk.bytesize
|
|
|
|
n > config[:InputBufferSize] and err << "#{n} > :InputBufferSize"
|
|
|
|
total += n
|
|
|
|
all << chunk
|
|
|
|
end
|
|
|
|
ret.nil? or err << 'req.body should return nil'
|
|
|
|
(buf * nr_out) == all or err << 'input body does not match expected'
|
|
|
|
res.header['connection'] = 'close'
|
|
|
|
res.body = err.join("\n")
|
|
|
|
})
|
|
|
|
TCPSocket.open(addr, port) do |c|
|
|
|
|
c.write("POST / HTTP/1.1\r\nHost: example.com\r\n" \
|
|
|
|
"Transfer-Encoding: chunked\r\n\r\n")
|
|
|
|
chunk = "#{buf.bytesize.to_s(16)}\r\n#{buf}\r\n"
|
|
|
|
nr_out.times { c.write(chunk) }
|
|
|
|
c.write("0\r\n\r\n")
|
|
|
|
head, body = c.read.split("\r\n\r\n")
|
|
|
|
assert_match %r{\AHTTP/1\.1 200 OK}, head
|
|
|
|
assert_nil body
|
|
|
|
end
|
|
|
|
}
|
|
|
|
end
|
2005-01-07 06:05:22 -05:00
|
|
|
end
|