aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/pop.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 77afeb9e72..3246f7644f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 16 15:27:36 2012 Masaki Matsushita <glass.saga@gmail.com>
+
+ * lib/net/pop.rb (POP3.certs): fix typo in comment.
+ patch from no6v (Nobuhiro IMAI) <nov@yo.rim.or.jp>.
+ [ruby-dev:46519] [Bug #7355]
+
Fri Nov 16 12:36:47 2012 NARUSE, Yui <naruse@ruby-lang.org>
* test/rake/helper.rb (Rake::TestCase#setup): revert r37669.
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 07365854a1..fd869b6985 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -375,7 +375,7 @@ module Net
return @ssl_params[:verify_mode]
end
- # returns the :ca_file or :ca_path from POP3.ssh_params
+ # returns the :ca_file or :ca_path from POP3.ssl_params
def POP3.certs
return @ssl_params[:ca_file] || @ssl_params[:ca_path]
end