* 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

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/pstore.rb b/lib/pstore.rb
index 6df64474ab..ab495d9ed7 100644
--- a/lib/pstore.rb
+++ b/lib/pstore.rb
@@ -11,14 +11,14 @@ require "fileutils"
 require "digest/md5"
 
 #
-# PStore implements a file based persistance mechanism based on a Hash.  User
+# PStore implements a file based persistence mechanism based on a Hash.  User
 # code can store hierarchies of Ruby objects (values) into the data store file
 # by name (keys).  An object hierarchy may be just a single object.  User code 
 # may later read values back from the data store or even update data, as needed.
 # 
 # The transactional behavior ensures that any changes succeed or fail together.
 # This can be used to ensure that the data store is not left in a transitory
-# state, where some values were upated but others were not.
+# state, where some values were updated but others were not.
 # 
 # Behind the scenes, Ruby objects are stored to the data store file with 
 # Marshal.  That carries the usual limitations.  Proc objects cannot be