summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-04 05:51:11 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-04 05:51:11 +0000
commita2d0d15b711cae6fcc63a5b1b8cceb45946c60d1 (patch)
tree74c20234d4aae42e343425926efe82139f03339d
parent8baf1746a4b399e784ad0a2b54bf522762a7189e (diff)
merge revision(s) 18351:
* lib/net/smtp.rb (Net::SMTP::rcptto): fix a typo. a patch from Masao Takaku <masao at nii.ac.jp> fix [ruby-dev:35489]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/smtp.rb2
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a3f4d7..04201a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 4 14:49:35 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * lib/net/smtp.rb (Net::SMTP::rcptto): fix a typo. a patch from
+ Masao Takaku <masao at nii.ac.jp>
+ fix [ruby-dev:35489].
+
Mon Aug 4 14:13:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* regex.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 57dee9a..7c9d938 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -837,7 +837,7 @@ module Net
def rcptto(to_addr)
if $SAFE > 0
- raise SecurityError, 'tainted to_addr' if to.tainted?
+ raise SecurityError, 'tainted to_addr' if to_addr.tainted?
end
getok("RCPT TO:<#{to_addr}>")
end
diff --git a/version.h b/version.h
index 2a7efa4..6a0589a 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-08-04"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080804
-#define RUBY_PATCHLEVEL 69
+#define RUBY_PATCHLEVEL 70
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8