From: David von Oheimb <dev@ddvo.net>
Date: Wed, 31 Jul 2024 17:36:16 +0000 (+0200)
Subject: http_server.{c,h}: make clear that IPv4 or IPv6 is used by http_server_init()
X-Git-Tag: openssl-3.3.3~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3d09396e254ff3e3463bdd0a4e3d0d56997a956;p=thirdparty%2Fopenssl.git

http_server.{c,h}: make clear that IPv4 or IPv6 is used by http_server_init()

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25010)

(cherry picked from commit ec4b123a96938162e7b926ffd7a0512c5d0b12f0)
---

diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index dcb48603713..0db0de2aa79 100644
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -202,6 +202,7 @@ BIO *http_server_init(const char *prog, const char *port, int verb)
         goto err;
     acbio = BIO_new(BIO_s_accept());
     if (acbio == NULL
+        || BIO_set_accept_ip_family(acbio, BIO_FAMILY_IPANY) <= 0 /* IPv4/6 */
         || BIO_set_bind_mode(acbio, BIO_BIND_REUSEADDR) <= 0
         || BIO_set_accept_name(acbio, name) <= 0) {
         log_HTTP(prog, LOG_ERR, "error setting up accept BIO");