Skip to content

Commit 9f6b21a

Browse files
committed
mod_ssl: Remove warning over potential uninitialised value
for ssl protocol prior to protocol selection. Merges r1924757 trunk Submitted by: minfrin Reviewed by: minfrin, rpluem, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926321 13f79535-47bb-0310-9956-ffa450edef68
1 parent 80be2bf commit 9f6b21a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

CHANGES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
-*- coding: utf-8 -*-
22
Changes with Apache 2.4.64
33

4+
*) mod_ssl: Remove warning over potential uninitialised value
5+
for ssl protocol prior to protocol selection.
6+
[Graham Leggett]
7+
48
*) mod_proxy: Reuse ProxyRemote connections when possible, like prior
59
to 2.4.59. [Jean-Frederic Clere, Yann Ylavic]
610

modules/ssl/ssl_engine_init.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,12 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s,
618618
int protocol = mctx->protocol;
619619
SSLSrvConfigRec *sc = mySrvConfig(s);
620620
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
621-
int prot;
621+
/* default is highest supported version, will be overridden below */
622+
#if SSL_HAVE_PROTOCOL_TLSV1_3
623+
int prot = TLS1_3_VERSION;
624+
#else
625+
int prot = TLS1_2_VERSION;
626+
#endif
622627
#endif
623628

624629
/*

0 commit comments

Comments
 (0)