shyouhei	2008-06-15 21:27:24 +0900 (Sun, 15 Jun 2008)

  New Revision: 17228

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/net/pop.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 15900:
    * lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
      @n_bytes as well.  [ruby-core:16144]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/net/pop.rb?r1=17228&r2=17227&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17228&r2=17227&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17228&r2=17227&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17227)
+++ ruby_1_8_5/ChangeLog	(revision 17228)
@@ -1,3 +1,8 @@
+Sun Jun 15 21:26:54 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
+	  @n_bytes as well.  [ruby-core:16144]
+
 Sun Jun 15 21:07:37 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17227)
+++ ruby_1_8_5/version.h	(revision 17228)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 190
+#define RUBY_PATCHLEVEL 191
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/net/pop.rb
===================================================================
--- ruby_1_8_5/lib/net/pop.rb	(revision 17227)
+++ ruby_1_8_5/lib/net/pop.rb	(revision 17228)
@@ -462,6 +462,8 @@
 
     def do_finish
       @mails = nil
+      @n_mails = nil
+      @n_bytes = nil
       @command.quit if @command
     ensure
       @started = false

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/