summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:40:40 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-17 12:40:40 +0000
commit91db0310271249ca3756b77f67824ee7e43e7bd1 (patch)
tree0444a75237d42a2a2e0c3eddd45ff13290573ba2
parenta571edd80a8a30fc9fba79ebe5bf7bf9133e1f63 (diff)
* lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821
violation. [ruby-dev:35487] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/smtp.rb13
-rw-r--r--version.h2
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d4c33aac74..26d94f1d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 21:37:39 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821
+ violation. [ruby-dev:35487]
+
Thu Jul 17 21:31:46 2008 Tanaka Akira <akr@fsij.org>
* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index 35108966c5..a4a2c52d58 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -289,7 +289,7 @@ module Net
# +port+ is the port to connect to; it defaults to port 25.
#
# +helo+ is the _HELO_ _domain_ provided by the client to the
- # server (see overview comments); it defaults to 'localhost'.
+ # server (see overview comments); it defaults to 'localhost.localdomain'.
#
# The remaining arguments are used for SMTP authentication, if required
# or desired. +user+ is the account name; +secret+ is your password
@@ -309,10 +309,9 @@ module Net
# * IOError
# * TimeoutError
#
- def SMTP.start( address, port = nil,
- helo = 'localhost',
- user = nil, secret = nil, authtype = nil,
- &block) # :yield: smtp
+ def SMTP.start(address, port = nil, helo = 'localhost.localdomain',
+ user = nil, secret = nil, authtype = nil,
+ &block) # :yield: smtp
new(address, port).start(helo, user, secret, authtype, &block)
end
@@ -371,8 +370,8 @@ module Net
# * IOError
# * TimeoutError
#
- def start( helo = 'localhost',
- user = nil, secret = nil, authtype = nil ) # :yield: smtp
+ def start(helo = 'localhost.localdomain',
+ user = nil, secret = nil, authtype = nil) # :yield: smtp
if block_given?
begin
do_start(helo, user, secret, authtype)
diff --git a/version.h b/version.h
index 777859941d..3cb281205f 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-07-17"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080717
-#define RUBY_PATCHLEVEL 278
+#define RUBY_PATCHLEVEL 279
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8