Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 3 deletions

diff --git a/upstream/debian-unstable/man3/BIO_s_accept.3ssl b/upstream/debian-unstable/man3/BIO_s_accept.3ssl
index 7be2b4f2..23546c10 100644
--- a/upstream/debian-unstable/man3/BIO_s_accept.3ssl
+++ b/upstream/debian-unstable/man3/BIO_s_accept.3ssl
@@ -55,14 +55,14 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_S_ACCEPT 3SSL"
-.TH BIO_S_ACCEPT 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH BIO_S_ACCEPT 3SSL 2024-04-04 3.2.2-dev OpenSSL
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH NAME
 BIO_s_accept, BIO_set_accept_name, BIO_set_accept_port, BIO_get_accept_name,
-BIO_get_accept_port, BIO_new_accept, BIO_set_nbio_accept, BIO_set_accept_bios,
+BIO_get_accept_port, BIO_new_accept, BIO_set_nbio_accept, BIO_set_tfo_accept, BIO_set_accept_bios,
 BIO_get_peer_name, BIO_get_peer_port,
 BIO_get_accept_ip_family, BIO_set_accept_ip_family,
 BIO_set_bind_mode, BIO_get_bind_mode, BIO_do_accept \- accept BIO
@@ -82,6 +82,7 @@ BIO_set_bind_mode, BIO_get_bind_mode, BIO_do_accept \- accept BIO
 \& BIO *BIO_new_accept(char *host_port);
 \&
 \& long BIO_set_nbio_accept(BIO *b, int n);
+\& long BIO_set_tfo_accept(BIO *b, int n);
 \& long BIO_set_accept_bios(BIO *b, char *bio);
 \&
 \& char *BIO_get_peer_name(BIO *b);
@@ -146,6 +147,11 @@ a single call: that is it creates a new accept BIO with port
 \&\fBBIO_set_nbio_accept()\fR sets the accept socket to blocking mode
 (the default) if \fBn\fR is 0 or non blocking mode if \fBn\fR is 1.
 .PP
+\&\fBBIO_set_tfo_accept()\fR enables TCP Fast Open on the accept socket
+if \fBn\fR is 1 or disables TCP Fast Open if \fBn\fR is 0 (the default).
+Setting the value to 1 is equivalent to setting \fBBIO_SOCK_TFO\fR
+in \fBBIO_set_bind_mode()\fR.
+.PP
 \&\fBBIO_set_accept_bios()\fR can be used to set a chain of BIOs which
 will be duplicated and prepended to the chain when an incoming
 connection is received. This is useful if, for example, a
@@ -166,7 +172,9 @@ then another socket cannot be bound to the same port. If
 same port. If \fBBIO_BIND_REUSEADDR_IF_UNUSED\fR is set then and
 attempt is first made to use BIO_BIN_NORMAL, if this fails
 and the port is not in use then a second attempt is made
-using \fBBIO_BIND_REUSEADDR\fR.
+using \fBBIO_BIND_REUSEADDR\fR. If \fBBIO_SOCK_TFO\fR is set, then
+the socket will be configured to accept TCP Fast Open
+connections.
 .PP
 \&\fBBIO_do_accept()\fR serves two functions. When it is first
 called, after the accept BIO has been setup, it will attempt
@@ -289,6 +297,9 @@ down each and finally closes both down.
 \& BIO_free(cbio);
 \& BIO_free(cbio2);
 .Ve
+.SH HISTORY
+.IX Header "HISTORY"
+\&\fBBIO_set_tfo_accept()\fR was added in OpenSSL 3.2.
 .SH COPYRIGHT
 .IX Header "COPYRIGHT"
 Copyright 2000\-2022 The OpenSSL Project Authors. All Rights Reserved.