[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  a497a90213b50c499f2a385e63e1fa6e13ef283a (commit)
      from  79b2a2f2eedb9d6b24a3f6748332328cf54568fb (commit)


- Log -----------------------------------------------------------------
commit a497a90213b50c499f2a385e63e1fa6e13ef283a
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Sat Dec 18 16:48:31 2021 +0100

    http_test.c: Simplify constant init of 'server_args' struct for gcc-4.8.x
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17308)

-----------------------------------------------------------------------

Summary of changes:
 test/http_test.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/http_test.c b/test/http_test.c
index d684c5eb18..49e770cd88 100644
--- a/test/http_test.c
+++ b/test/http_test.c
@@ -208,13 +208,14 @@ static int test_http_keep_alive(char version, int keep_alive, int kept_alive)
     BIO *rbio = BIO_new(BIO_s_mem());
     BIO *rsp;
     const char *const content_type = "application/x-x509-ca-cert";
-    server_args mock_args = { NULL, content_type, NULL, '0', 0 };
+    server_args mock_args = { NULL, NULL, NULL, '0', 0 };
     OSSL_HTTP_REQ_CTX *rctx = NULL;
     int i, res = 0;
 
     if (wbio == NULL || rbio == NULL)
         goto err;
     mock_args.out = rbio;
+    mock_args.content_type = content_type;
     mock_args.version = version;
     mock_args.keep_alive = kept_alive;
     BIO_set_callback_ex(wbio, http_bio_cb_ex);