aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/httpproxy.rb2
2 files changed, 5 insertions, 2 deletions
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 <shibata.hiroshi@gmail.com>
+
+ * lib/webrick/httpproxy.rb: remove needless condition
+ for old ruby version.
+
Fri Aug 8 01:07:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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: