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/rexml | |
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/rexml')
-rw-r--r-- | lib/rexml/attlistdecl.rb | 2 | ||||
-rw-r--r-- | lib/rexml/document.rb | 2 | ||||
-rw-r--r-- | lib/rexml/element.rb | 6 | ||||
-rw-r--r-- | lib/rexml/formatters/pretty.rb | 2 | ||||
-rw-r--r-- | lib/rexml/functions.rb | 2 | ||||
-rw-r--r-- | lib/rexml/text.rb | 2 | ||||
-rw-r--r-- | lib/rexml/xpath.rb | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb index d4b5c38af6..ef4721b5ce 100644 --- a/lib/rexml/attlistdecl.rb +++ b/lib/rexml/attlistdecl.rb @@ -44,7 +44,7 @@ module REXML @pairs.keys.include? key end - # Itterate over the key/value pairs: + # Iterate over the key/value pairs: # attlist_decl.each { |attribute_name, attribute_value| ... } def each(&block) @pairs.each(&block) diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb index 81e63c60f1..54aa691ad8 100644 --- a/lib/rexml/document.rb +++ b/lib/rexml/document.rb @@ -147,7 +147,7 @@ module REXML # A controversial point is whether Document should always write the XML # declaration (<?xml version='1.0'?>) whether or not one is given by the # user (or source document). REXML does not write one if one was not - # specified, because it adds unneccessary bandwidth to applications such + # specified, because it adds unnecessary bandwidth to applications such # as XML-RPC. # # See also the classes in the rexml/formatters package for the proper way diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb index 92612036a1..3db87c6126 100644 --- a/lib/rexml/element.rb +++ b/lib/rexml/element.rb @@ -360,7 +360,7 @@ module REXML # Iterates through the children, yielding for each Element that # has a particular text set. # text:: - # the text to search for. If nil, or not supplied, will itterate + # the text to search for. If nil, or not supplied, will iterate # over all +Element+ children that contain at least one +Text+ node. # max:: # (optional) causes this method to return after yielding @@ -989,7 +989,7 @@ module REXML end alias :size :length - # Itterates over the attributes of an Element. Yields actual Attribute + # Iterates over the attributes of an Element. Yields actual Attribute # nodes, not String values. # # doc = Document.new '<a x="1" y="2"/>' @@ -1006,7 +1006,7 @@ module REXML end end - # Itterates over each attribute of an Element, yielding the expanded name + # Iterates over each attribute of an Element, yielding the expanded name # and value as a pair of Strings. # # doc = Document.new '<a x="1" y="2"/>' diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb index 22b6d857cd..d21175d34a 100644 --- a/lib/rexml/formatters/pretty.rb +++ b/lib/rexml/formatters/pretty.rb @@ -125,7 +125,7 @@ module REXML end def wrap(string, width) - # Recursivly wrap string at width. + # Recursively wrap string at width. return string if string.length <= width place = string.rindex(' ', width) # Position in string with last ' ' before cutoff return string[0,place] + "\n" + wrap(string[place+1..-1], width) diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb index 8293e9c5ac..fefc9ef940 100644 --- a/lib/rexml/functions.rb +++ b/lib/rexml/functions.rb @@ -235,7 +235,7 @@ module REXML # from string then we ignore the second & # subsequent mappings # - # if a charactcer maps to nil then we delete it + # if a character maps to nil then we delete it # in the output. This happens if the from # string is longer than the to string # diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb index 9804aa710b..2bc00429b3 100644 --- a/lib/rexml/text.rb +++ b/lib/rexml/text.rb @@ -189,7 +189,7 @@ module REXML end def wrap(string, width, addnewline=false) - # Recursivly wrap string at width. + # Recursively wrap string at width. return string if string.length <= width place = string.rindex(' ', width) # Position in string with last ' ' before cutoff if addnewline then diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb index 939399e283..e8813efd3e 100644 --- a/lib/rexml/xpath.rb +++ b/lib/rexml/xpath.rb @@ -30,7 +30,7 @@ module REXML parser.parse(path, element).flatten[0] end - # Itterates over nodes that match the given path, calling the supplied + # Iterates over nodes that match the given path, calling the supplied # block with the match. # element:: # The context element |