summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 12:27:24 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 12:27:24 +0000
commit86c4bcac89f49994ba76501820290c5fb1bdfb48 (patch)
treebddc64ae97c1d6aff190f296b09faf7c27e0d086
parent45633971cc46b6e68f64dc8b9056e4a1381b2bcd (diff)
merge revision(s) 15900:
* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and @n_bytes as well. [ruby-core:16144] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/pop.rb2
-rw-r--r--version.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e292e3..c7ae6da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 21:26:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* lib/resolv.rb (Resolv::Config.default_config_hash): requires
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index b761241..39d446f 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -462,6 +462,8 @@ module Net
def do_finish
@mails = nil
+ @n_mails = nil
+ @n_bytes = nil
@command.quit if @command
ensure
@started = false
diff --git a/version.h b/version.h
index 74238ab..8136ca0 100644
--- a/version.h
+++ b/version.h
@@ -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