diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2019-08-25 19:29:52 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2019-08-25 19:29:52 +0900 |
| commit | 6944a1aa4f805c19faa3340f841a459f907f840e (patch) | |
| tree | d774b34bcf2506d646976953deb643b72e553c2c | |
| parent | c775ab5e2892a86e89cebc2c2d16e7b0fd190f19 (diff) | |
lib/webrick.rb: use require_relative for webrick/utils.rb
`require "webrick/utils.rb"` should load `lib/webrick/utils.rb`, but on
some CI machines, it wrongly loads `test/webrick/utils.rb`, which caused
circular require warning:
https://rubyci.org/logs/rubyci.s3.amazonaws.com/ubuntu/ruby-master/log/20190825T093007Z.log.html.gz
```
/data/chkbuild/tmp/build/20190825T093007Z/ruby/lib/rubygems/core_ext/kernel_require.rb:61: warning: /data/chkbuild/tmp/build/20190825T093007Z/ruby/lib/rubygems/core_ext/kernel_require.rb:61: warning: loading in progress, circular require considered harmful - /data/chkbuild/tmp/build/20190825T093007Z/ruby/lib/webrick.rb
```
| -rw-r--r-- | lib/webrick.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/webrick.rb b/lib/webrick.rb index cbaf18a792..1c0eb81dbd 100644 --- a/lib/webrick.rb +++ b/lib/webrick.rb @@ -212,7 +212,7 @@ require 'webrick/version.rb' require 'webrick/config.rb' require 'webrick/log.rb' require 'webrick/server.rb' -require 'webrick/utils.rb' +require_relative 'webrick/utils.rb' require 'webrick/accesslog' require 'webrick/htmlutils.rb' |