1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 26470c89ad..80790b33de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 10 12:19:43 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb (shutdown): Use close() on @shutdown_pipe_w to
+	  notify readability on the read side of the pipe.
+	  write_nonblock() is not usable for pipe on Windows.
+	  (cleanup_shutdown_pipe): Rescue IOError for @shutdown_pipe_w.close.
+
 Mon Nov 10 07:31:59 2014  Tanaka Akira  <akr@fsij.org>
 
 	* lib/webrick/server.rb (initialize): Initialize shutdown pipe here