diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2016-06-07 08:55:10 -0700 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2016-06-07 08:55:10 -0700 |
| commit | 693c86369b9ea54b59534673dd79660df4ffb449 (patch) | |
| tree | 90a236769044dec5be0ba401dfb856de376ae482 /actionmailer | |
| parent | 4b44a39e437393dbd7dd4687f3acbffc95a8cdab (diff) | |
| parent | 5e3fb2f7b0fe5871e3993da2a7cdd96872dc36c7 (diff) | |
| download | rails-693c86369b9ea54b59534673dd79660df4ffb449.tar.gz rails-693c86369b9ea54b59534673dd79660df4ffb449.tar.bz2 rails-693c86369b9ea54b59534673dd79660df4ffb449.zip | |
Merge pull request #25311 from jhass/openssl_verify_mode
Do not suggest nonsensical OpenSSL verify modes
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 6e0ae8a0a9..e766221008 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -390,9 +390,8 @@ module ActionMailer # to use it. Defaults to <tt>true</tt>. # * <tt>:openssl_verify_mode</tt> - When using TLS, you can set how OpenSSL checks the certificate. This is # really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name - # of an OpenSSL verify constant (<tt>'none'</tt>, <tt>'peer'</tt>, <tt>'client_once'</tt>, - # <tt>'fail_if_no_peer_cert'</tt>) or directly the constant (<tt>OpenSSL::SSL::VERIFY_NONE</tt>, - # <tt>OpenSSL::SSL::VERIFY_PEER</tt>, ...). + # of an OpenSSL verify constant (<tt>'none'</tt> or <tt>'peer'</tt>) or directly the constant + # (<tt>OpenSSL::SSL::VERIFY_NONE</tt> or <tt>OpenSSL::SSL::VERIFY_PEER</tt>). # <tt>:ssl/:tls</tt> Enables the SMTP connection to use SMTP/TLS (SMTPS: SMTP over direct TLS connection) # # * <tt>sendmail_settings</tt> - Allows you to override options for the <tt>:sendmail</tt> delivery method. |