diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2017-01-31 18:35:30 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-01-31 18:35:30 +0900 |
commit | 732318548f7c0e58f48c1baed3ed63b49a23e121 (patch) | |
tree | 50b09ccc5aaa84207159df1ae0ea38093a4e5e50 /lib | |
parent | 7b0ae4541c66ce228ba4abd75c8f35be177dc8f8 (diff) | |
parent | 74f166f410bd75d625a69ecc2b53601718294930 (diff) | |
download | ruby-openssl-732318548f7c0e58f48c1baed3ed63b49a23e121.tar.gz |
Merge branch 'maint'
* maint:
Ruby/OpenSSL 2.0.3
.travis.yml: test with Ruby 2.4
ruby-openssl-docker: update versions of Ruby and OpenSSL
x509: fix OpenSSL::X509::Name#eql?
test/envutil: fix assert_raise_with_message
buffering: fix typo in doc
Diffstat (limited to 'lib')
-rw-r--r-- | lib/openssl/buffering.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/openssl/buffering.rb b/lib/openssl/buffering.rb index 7fd647ca..b0dffefd 100644 --- a/lib/openssl/buffering.rb +++ b/lib/openssl/buffering.rb @@ -189,7 +189,7 @@ module OpenSSL::Buffering end ## - # Reads the next "line+ from the stream. Lines are separated by +eol+. If + # Reads the next "line" from the stream. Lines are separated by +eol+. If # +limit+ is provided the result will not be longer than the given number of # bytes. # @@ -344,7 +344,7 @@ module OpenSSL::Buffering end ## - # Writes +str+ in the non-blocking manner. + # Writes +s+ in the non-blocking manner. # # If there is buffered data, it is flushed first. This may block. # |