diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-07 07:21:13 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-07 07:21:13 +0000 |
commit | 257f08a00babfcbedec8c50c3e85040acc65de3a (patch) | |
tree | 8d0fc9ca5b4dbfa9885dc56862292d55091bcaac | |
parent | 8cfa1773652264837eab45cd907b1a99e9e20980 (diff) |
merge revision(s) 17839:
* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
'localhost.localdomain'. [ruby-dev:35333]
* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | lib/net/smtp.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Mon Jul 7 16:14:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of + 'localhost.localdomain'. [ruby-dev:35333] + + * lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto. + Mon Jul 7 12:07:28 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole.c: avoid creating Ruby object during diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index dda9dab072..35108966c5 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.localdomain'. + # server (see overview comments); it defaults to 'localhost'. # # The remaining arguments are used for SMTP authentication, if required # or desired. +user+ is the account name; +secret+ is your password @@ -310,7 +310,7 @@ module Net # * TimeoutError # def SMTP.start( address, port = nil, - helo = 'localhost.localdomain', + helo = 'localhost', user = nil, secret = nil, authtype = nil, &block) # :yield: smtp new(address, port).start(helo, user, secret, authtype, &block) @@ -371,7 +371,7 @@ module Net # * IOError # * TimeoutError # - def start( helo = 'localhost.localdomain', + def start( helo = 'localhost', user = nil, secret = nil, authtype = nil ) # :yield: smtp if block_given? begin @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-07-07" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080707 -#define RUBY_PATCHLEVEL 268 +#define RUBY_PATCHLEVEL 269 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |