diff --git a/ChangeLog b/ChangeLog index bc3ecaf842..2280bd7a96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 8 14:33:49 2014 SHIBATA Hiroshi + + * lib/webrick/httpproxy.rb: remove needless condition + for old ruby version. + Fri Aug 8 01:07:10 2014 Nobuyoshi Nakada * parse.y (parser_yylex): fix invalid char in eval, should raise diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index 77a2ea7108..cbba2d80f7 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -12,8 +12,6 @@ require "webrick/httpserver" require "net/http" -Net::HTTP::version_1_2 if RUBY_VERSION < "1.7" - module WEBrick NullReader = Object.new # :nodoc: