From e109aaa9797c16b0902f8f3302243283828fcfc1 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 24 Nov 2020 15:22:25 +0000 Subject: [PATCH] Fix no-posix-io The "multi" variable should only be used within HTTP_DAEMON guards. However there were a few spots where this was not the case, which causes no-posix-io builds to fail. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13498) --- apps/lib/http_server.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c index b7d9842013..7626ca9aa4 100644 --- a/apps/lib/http_server.c +++ b/apps/lib/http_server.c @@ -30,13 +30,10 @@ # endif #endif -int multi = 0; /* run multiple responder processes */ - #ifdef HTTP_DAEMON +int multi = 0; /* run multiple responder processes */ int acfd = (int) INVALID_SOCKET; -#endif -#ifdef HTTP_DAEMON static int print_syslog(const char *str, size_t len, void *levPtr) { int level = *(int *)levPtr; @@ -61,9 +58,9 @@ void log_message(const char *prog, int level, const char *fmt, ...) syslog(level, "%s", buf); if (level >= LOG_ERR) ERR_print_errors_cb(print_syslog, &level); - } + } else #endif - if (!multi) { + { BIO_printf(bio_err, "%s: ", prog); BIO_vprintf(bio_err, fmt, ap); BIO_printf(bio_err, "\n"); -- 2.39.5