1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 50c4c8b0a2..a81068d0b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  9 08:24:24 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): terminates @receiver_thread even if
+	  @sock.shutdown raises an exception.  [ruby-dev:34881]
+
 Sun May  9 06:15:21 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed