summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--lib/webrick/config.rb2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 296db7e728..113a5b39f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug 12 21:05:19 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/webrick/config.rb (WEBrick::Config::General):
+ disable reverse lookup by default. [ruby-core:45514] [Feature #6559]
+ Socket.do_not_reverse_lookup is true by default but WEBrick
+ overwrote it.
+ patch by Eric Hodel [ruby-core:45527]
+
Fri Aug 12 12:50:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (rb_syntax_error_append): fix newline in syntax error
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 5f7b0a7fa4..98c9701633 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -34,7 +34,7 @@ module WEBrick
:StartCallback => nil,
:StopCallback => nil,
:AcceptCallback => nil,
- :DoNotReverseLookup => nil,
+ :DoNotReverseLookup => true,
:ShutdownSocketWithoutClose => false,
}