diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 08:05:24 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 08:05:24 +0000 |
| commit | 061fd36d75bff6335d2c6fdced5a70eb14bc8322 (patch) | |
| tree | 19e04b8c92576201ace9e7f828047a44776383a4 /lib/net | |
| parent | 70bde7a3b5347e6e68a6cb82714ef03304c13bb1 (diff) | |
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
Add a null check for ssl; submitted by akira yamada
in [ruby-dev:34950].
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
SSL_OP_NO_TICKET is present; submitted by akira yamada
in [ruby-dev:34944].
* test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
workaround for the case where OpenSSL is configured with
--enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
| -rw-r--r-- | lib/net/https.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/https.rb b/lib/net/https.rb index e296dbbed4..7847c3ffea 100644 --- a/lib/net/https.rb +++ b/lib/net/https.rb @@ -65,11 +65,11 @@ It can be replaced by the following code: : key, key=((|key|)) Sets an OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object. - (This method is appeared in Michal Rokos's OpenSSL extention.) + (This method is appeared in Michal Rokos's OpenSSL extension.) : cert, cert=((|cert|)) Sets an OpenSSL::X509::Certificate object as client certificate - (This method is appeared in Michal Rokos's OpenSSL extention). + (This method is appeared in Michal Rokos's OpenSSL extension). : ca_file, ca_file=((|path|)) Sets path of a CA certification file in PEM format. |