]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
http_test.c: Simplify constant init of 'server_args' struct for gcc-4.8.x
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Sat, 18 Dec 2021 15:48:31 +0000 (16:48 +0100)
committerDr. David von Oheimb <dev@ddvo.net>
Tue, 21 Dec 2021 11:18:04 +0000 (12:18 +0100)
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17308)

test/http_test.c

index d684c5eb182437e663f5d80932e7e1011ada2f00..49e770cd886bcca3f630f55600c0e18d038cdcdd 100644 (file)
@@ -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);