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 | 331b1c5c6f7f2c3398b764d7785b5f0921aad3d4 (patch) | |
| tree | 8d0fc9ca5b4dbfa9885dc56862292d55091bcaac /lib | |
| parent | 1b2f9599c71b152dc2ac84756bbd50dc967fb11f (diff) | |
| download | ruby-331b1c5c6f7f2c3398b764d7785b5f0921aad3d4.tar.gz ruby-331b1c5c6f7f2c3398b764d7785b5f0921aad3d4.tar.xz ruby-331b1c5c6f7f2c3398b764d7785b5f0921aad3d4.zip | |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/smtp.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index dda9dab07..35108966c 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 |