summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS.md6
-rw-r--r--ext/openssl/ossl_ssl.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/NEWS.md b/NEWS.md
index 3d88e29ddf..9273e0adff 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -123,11 +123,11 @@ releases.
* pstore 0.2.1
* 0.2.0 to [v0.2.1][pstore-v0.2.1]
* rdoc 7.2.0
- * 7.0.3 to [v7.1.0][rdoc-v7.1.0], [v7.2.0][rdoc-v7.2.0]
+ * 7.0.3 to [v7.0.4][rdoc-v7.0.4], [v7.1.0][rdoc-v7.1.0], [v7.2.0][rdoc-v7.2.0]
* win32ole 1.9.3
* 1.9.2 to [v1.9.3][win32ole-v1.9.3]
* irb 1.18.0
- * 1.16.0 to [v1.17.0][irb-v1.17.0]
+ * 1.16.0 to [v1.17.0][irb-v1.17.0], [v1.18.0][irb-v1.18.0]
### RubyGems and Bundler
@@ -241,7 +241,9 @@ A lot of work has gone into making Ractors more stable, performant, and usable.
[repl_type_completor-v0.1.14]: https://github.com/ruby/repl_type_completor/releases/tag/v0.1.14
[repl_type_completor-v0.1.15]: https://github.com/ruby/repl_type_completor/releases/tag/v0.1.15
[pstore-v0.2.1]: https://github.com/ruby/pstore/releases/tag/v0.2.1
+[rdoc-v7.0.4]: https://github.com/ruby/rdoc/releases/tag/v7.0.4
[rdoc-v7.1.0]: https://github.com/ruby/rdoc/releases/tag/v7.1.0
[rdoc-v7.2.0]: https://github.com/ruby/rdoc/releases/tag/v7.2.0
[win32ole-v1.9.3]: https://github.com/ruby/win32ole/releases/tag/v1.9.3
[irb-v1.17.0]: https://github.com/ruby/irb/releases/tag/v1.17.0
+[irb-v1.18.0]: https://github.com/ruby/irb/releases/tag/v1.18.0
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 9c0b689579..3d913a3968 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -2196,9 +2196,12 @@ ossl_ssl_write(VALUE self, VALUE str)
/*
* call-seq:
* ssl.syswrite_nonblock(string) => Integer
+ * ssl.syswrite_nonblock(string, opts) => Integer
*
* Writes _string_ to the SSL connection in a non-blocking manner. Raises an
- * SSLError if writing would block.
+ * SSLError if writing would block. If "exception: false" is passed, this
+ * method returns a symbol of :wait_readable or :wait_writable, rather than
+ * raising an exception.
*/
static VALUE
ossl_ssl_write_nonblock(int argc, VALUE *argv, VALUE self)