diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-02 17:52:33 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-02 17:52:33 +0000 |
commit | e859e668d2eb59f34ad18edb7458ce90076617e9 (patch) | |
tree | 0c2866cf07670dbcea797ee96a620e5d761af417 /lib/webrick | |
parent | c8c66bcf92b94951fd2035761f91e6cde3145d7f (diff) |
lib/*: Prefer require_relative over require.
[#15206] [Fix GH-1976]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
-rw-r--r-- | lib/webrick/cgi.rb | 6 | ||||
-rw-r--r-- | lib/webrick/config.rb | 10 | ||||
-rw-r--r-- | lib/webrick/cookie.rb | 2 | ||||
-rw-r--r-- | lib/webrick/httpauth.rb | 10 | ||||
-rw-r--r-- | lib/webrick/httpauth/basicauth.rb | 6 | ||||
-rw-r--r-- | lib/webrick/httpauth/digestauth.rb | 6 | ||||
-rw-r--r-- | lib/webrick/httpauth/htdigest.rb | 4 | ||||
-rw-r--r-- | lib/webrick/httpauth/htpasswd.rb | 4 | ||||
-rw-r--r-- | lib/webrick/httpproxy.rb | 2 | ||||
-rw-r--r-- | lib/webrick/httprequest.rb | 8 | ||||
-rw-r--r-- | lib/webrick/httpresponse.rb | 8 | ||||
-rw-r--r-- | lib/webrick/https.rb | 4 | ||||
-rw-r--r-- | lib/webrick/httpserver.rb | 14 | ||||
-rw-r--r-- | lib/webrick/httpservlet.rb | 10 | ||||
-rw-r--r-- | lib/webrick/httpservlet/abstract.rb | 6 | ||||
-rw-r--r-- | lib/webrick/httpservlet/cgihandler.rb | 4 | ||||
-rw-r--r-- | lib/webrick/httpservlet/filehandler.rb | 6 | ||||
-rw-r--r-- | lib/webrick/httpstatus.rb | 2 | ||||
-rw-r--r-- | lib/webrick/server.rb | 4 |
19 files changed, 58 insertions, 58 deletions
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index 33f1542731..bb0ae2fc84 100644 --- a/lib/webrick/cgi.rb +++ b/lib/webrick/cgi.rb @@ -8,9 +8,9 @@ # # $Id$ -require "webrick/httprequest" -require "webrick/httpresponse" -require "webrick/config" +require_relative "httprequest" +require_relative "httpresponse" +require_relative "config" require "stringio" module WEBrick diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb index af4b561534..9f2ab44f49 100644 --- a/lib/webrick/config.rb +++ b/lib/webrick/config.rb @@ -9,11 +9,11 @@ # # $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/version' -require 'webrick/httpversion' -require 'webrick/httputils' -require 'webrick/utils' -require 'webrick/log' +require_relative 'version' +require_relative 'httpversion' +require_relative 'httputils' +require_relative 'utils' +require_relative 'log' module WEBrick module Config diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb index 24bf92ec00..5fd3bfb228 100644 --- a/lib/webrick/cookie.rb +++ b/lib/webrick/cookie.rb @@ -10,7 +10,7 @@ # $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $ require 'time' -require 'webrick/httputils' +require_relative 'httputils' module WEBrick diff --git a/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb index bbb6776528..f8bf09a6f1 100644 --- a/lib/webrick/httpauth.rb +++ b/lib/webrick/httpauth.rb @@ -9,11 +9,11 @@ # # $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/httpauth/basicauth' -require 'webrick/httpauth/digestauth' -require 'webrick/httpauth/htpasswd' -require 'webrick/httpauth/htdigest' -require 'webrick/httpauth/htgroup' +require_relative 'httpauth/basicauth' +require_relative 'httpauth/digestauth' +require_relative 'httpauth/htpasswd' +require_relative 'httpauth/htdigest' +require_relative 'httpauth/htgroup' module WEBrick diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb index 751885bc3e..7d0a9cfc8f 100644 --- a/lib/webrick/httpauth/basicauth.rb +++ b/lib/webrick/httpauth/basicauth.rb @@ -8,9 +8,9 @@ # # $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $ -require 'webrick/config' -require 'webrick/httpstatus' -require 'webrick/httpauth/authenticator' +require_relative '../config' +require_relative '../httpstatus' +require_relative 'authenticator' module WEBrick module HTTPAuth diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb index 94f849a02e..6416a40998 100644 --- a/lib/webrick/httpauth/digestauth.rb +++ b/lib/webrick/httpauth/digestauth.rb @@ -12,9 +12,9 @@ # # $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $ -require 'webrick/config' -require 'webrick/httpstatus' -require 'webrick/httpauth/authenticator' +require_relative '../config' +require_relative '../httpstatus' +require_relative 'authenticator' require 'digest/md5' require 'digest/sha1' diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb index c35b38433b..93b18e2c75 100644 --- a/lib/webrick/httpauth/htdigest.rb +++ b/lib/webrick/httpauth/htdigest.rb @@ -8,8 +8,8 @@ # # $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $ -require 'webrick/httpauth/userdb' -require 'webrick/httpauth/digestauth' +require_relative 'userdb' +require_relative 'digestauth' require 'tempfile' module WEBrick diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb index cff18a8012..abca30532e 100644 --- a/lib/webrick/httpauth/htpasswd.rb +++ b/lib/webrick/httpauth/htpasswd.rb @@ -8,8 +8,8 @@ # # $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $ -require 'webrick/httpauth/userdb' -require 'webrick/httpauth/basicauth' +require_relative 'userdb' +require_relative 'basicauth' require 'tempfile' module WEBrick diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index d180ff4831..d05d59514c 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -10,7 +10,7 @@ # $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $ # $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $ -require "webrick/httpserver" +require_relative "httpserver" require "net/http" module WEBrick diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index ac60c3937f..e402099a30 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -10,10 +10,10 @@ # $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $ require 'uri' -require 'webrick/httpversion' -require 'webrick/httpstatus' -require 'webrick/httputils' -require 'webrick/cookie' +require_relative 'httpversion' +require_relative 'httpstatus' +require_relative 'httputils' +require_relative 'cookie' module WEBrick diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index 255a27f6b9..bc1dacc837 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -11,10 +11,10 @@ require 'time' require 'uri' -require 'webrick/httpversion' -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative 'httpversion' +require_relative 'htmlutils' +require_relative 'httputils' +require_relative 'httpstatus' module WEBrick ## diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb index 4826654d3a..b0a49bc40b 100644 --- a/lib/webrick/https.rb +++ b/lib/webrick/https.rb @@ -9,8 +9,8 @@ # # $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/ssl' -require 'webrick/httpserver' +require_relative 'ssl' +require_relative 'httpserver' module WEBrick module Config diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb index e46b3bd1ad..6945868ec8 100644 --- a/lib/webrick/httpserver.rb +++ b/lib/webrick/httpserver.rb @@ -10,13 +10,13 @@ # $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $ require 'io/wait' -require 'webrick/server' -require 'webrick/httputils' -require 'webrick/httpstatus' -require 'webrick/httprequest' -require 'webrick/httpresponse' -require 'webrick/httpservlet' -require 'webrick/accesslog' +require_relative 'server' +require_relative 'httputils' +require_relative 'httpstatus' +require_relative 'httprequest' +require_relative 'httpresponse' +require_relative 'httpservlet' +require_relative 'accesslog' module WEBrick class HTTPServerError < ServerError; end diff --git a/lib/webrick/httpservlet.rb b/lib/webrick/httpservlet.rb index 1ee04ec86f..da49a1405b 100644 --- a/lib/webrick/httpservlet.rb +++ b/lib/webrick/httpservlet.rb @@ -9,11 +9,11 @@ # # $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $ -require 'webrick/httpservlet/abstract' -require 'webrick/httpservlet/filehandler' -require 'webrick/httpservlet/cgihandler' -require 'webrick/httpservlet/erbhandler' -require 'webrick/httpservlet/prochandler' +require_relative 'httpservlet/abstract' +require_relative 'httpservlet/filehandler' +require_relative 'httpservlet/cgihandler' +require_relative 'httpservlet/erbhandler' +require_relative 'httpservlet/prochandler' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb index fc4cd2275a..bccb091861 100644 --- a/lib/webrick/httpservlet/abstract.rb +++ b/lib/webrick/httpservlet/abstract.rb @@ -9,9 +9,9 @@ # # $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $ -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative '../htmlutils' +require_relative '../httputils' +require_relative '../httpstatus' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb index b1fb471c54..981f649750 100644 --- a/lib/webrick/httpservlet/cgihandler.rb +++ b/lib/webrick/httpservlet/cgihandler.rb @@ -11,8 +11,8 @@ require 'rbconfig' require 'tempfile' -require 'webrick/config' -require 'webrick/httpservlet/abstract' +require_relative '../config' +require_relative 'abstract' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb index 0072e81ac6..cb9c8b0976 100644 --- a/lib/webrick/httpservlet/filehandler.rb +++ b/lib/webrick/httpservlet/filehandler.rb @@ -11,9 +11,9 @@ require 'time' -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative '../htmlutils' +require_relative '../httputils' +require_relative '../httpstatus' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb index 0630219ada..c811f21964 100644 --- a/lib/webrick/httpstatus.rb +++ b/lib/webrick/httpstatus.rb @@ -9,7 +9,7 @@ # # $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $ -require 'webrick/accesslog' +require_relative 'accesslog' module WEBrick diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 88e160d981..4a6e74c4f9 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -10,8 +10,8 @@ # $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $ require 'socket' -require 'webrick/config' -require 'webrick/log' +require_relative 'config' +require_relative 'log' module WEBrick |