The branch OpenSSL_1_1_1-stable has been updated via d38ef8c89e11ed5b033a911a7d40b833992c6e09 (commit) from f1006f188c90e81898b69fb84e67e674bcdae030 (commit)
- Log ----------------------------------------------------------------- commit d38ef8c89e11ed5b033a911a7d40b833992c6e09 Author: A. Schulze <g...@andeasschulze.de> Date: Sat Mar 9 19:05:31 2019 +0100 Fix two spelling errors CLA: trivial Reviewed-by: Richard Levitte <levi...@openssl.org> Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com> (Merged from https://github.com/openssl/openssl/pull/8447) (cherry picked from commit 3dcbb6c4a395d56dfa561145d89017ff958bb18e) ----------------------------------------------------------------------- Summary of changes: doc/man1/s_client.pod | 2 +- doc/man3/SSL_CTX_set_read_ahead.pod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/man1/s_client.pod b/doc/man1/s_client.pod index 81d516a..7e42932 100644 --- a/doc/man1/s_client.pod +++ b/doc/man1/s_client.pod @@ -201,7 +201,7 @@ Even though SNI should normally be a DNS name and not an IP address, if B<-servername> is provided then that name will be sent, regardless of whether it is a DNS name or not. -This option cannot be used in conjuction with B<-noservername>. +This option cannot be used in conjunction with B<-noservername>. =item B<-noservername> diff --git a/doc/man3/SSL_CTX_set_read_ahead.pod b/doc/man3/SSL_CTX_set_read_ahead.pod index 137e251..c9869e9 100644 --- a/doc/man3/SSL_CTX_set_read_ahead.pod +++ b/doc/man3/SSL_CTX_set_read_ahead.pod @@ -46,7 +46,7 @@ records, and SSL_has_pending() can't tell the difference between processed and unprocessed data, it's recommended that if read ahead is turned on that B<SSL_MODE_AUTO_RETRY> is not turned off using SSL_CTX_clear_mode(). That will prevent getting B<SSL_ERROR_WANT_READ> when there is still a complete -record availale that hasn't been processed. +record available that hasn't been processed. If the application wants to continue to use the underlying transport (e.g. TCP connection) after the SSL connection is finished using SSL_shutdown() reading