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/cgi | |
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/cgi')
-rw-r--r-- | lib/cgi/session.rb | 4 | ||||
-rw-r--r-- | lib/cgi/session/pstore.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index e7e7587c65..a6e999bc34 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -230,7 +230,7 @@ class CGI # session_path:: the path for which this session applies. Defaults # to the directory of the CGI script. # - # +option+ is also passed on to the session storage class initialiser; see + # +option+ is also passed on to the session storage class initializer; see # the documentation for each session storage class for the options # they support. # @@ -357,7 +357,7 @@ class CGI # characters; automatically generated session ids observe # this requirement. # - # +option+ is a hash of options for the initialiser. The + # +option+ is a hash of options for the initializer. The # following options are recognised: # # tmpdir:: the directory to use for storing the FileStore diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb index bd93d0a6ff..3d204d5dc0 100644 --- a/lib/cgi/session/pstore.rb +++ b/lib/cgi/session/pstore.rb @@ -30,7 +30,7 @@ class CGI # characters; automatically generated session ids observe # this requirement. # - # +option+ is a hash of options for the initialiser. The + # +option+ is a hash of options for the initializer. The # following options are recognised: # # tmpdir:: the directory to use for storing the PStore |