diff --git a/ChangeLog b/ChangeLog
index 8a31f53344..54ffea8ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Mar 12 07:35:36 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb (WEBrick::Config::General): add
+	  :DoNotReverseLookup.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call 
+	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
+	  is set.  [ruby-code:02357]
+
 Wed Mar 10 22:26:25 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 11e1966f13..9d2365e40e 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -33,6 +33,7 @@ module WEBrick
       :StartCallback  => nil,
       :StopCallback   => nil,
       :AcceptCallback => nil,
+      :DoNotReverseLookup => nil,
     }
 
     # for HTTPServer, HTTPRequest, HTTPResponse ...
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 93e3b2ccf5..0668e27b05 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -90,6 +90,9 @@ module WEBrick
                 @tokens.pop          # blocks while no token is there.
                 sock = svr.accept
                 sock.sync = true
+                if @config[:DoNotReverseLookup]
+                  sock.do_not_reverse_lookup = true
+                end
                 Utils::set_close_on_exec(sock)
                 th = start_thread(sock, &block)
                 th[:WEBrickThread] = true