On Tue, Jun 18, 2019 at 07:29:51PM +0200, Christophe JAILLET wrote:
> Hi,
>
> Just for the records, this is apparently already pat of r1809037 on trunk.
Stefan are you planning to merge the changes here to 2.4.x any time
soon? If not can I get a few +1s on the attached so 2.4.x can be
warning-free with gcc 8+?
There is divergence between trunk and 2.4 here and I don't want to break
anything, this patch is simply a noop to remove the warnings without
changing behaviour.
Regards, Joe
Index: modules/ssl/ssl_engine_init.c
===================================================================
--- modules/ssl/ssl_engine_init.c (revision 1862390)
+++ modules/ssl/ssl_engine_init.c (working copy)
@@ -1767,9 +1767,9 @@
"for the Managed Domain to take over.",
ssl_util_vhostid(p, s));
}
else {
- const char *key_file, *cert_file, *chain_file;
+ const char *key_file, *cert_file;
- key_file = cert_file = chain_file = NULL;
+ key_file = cert_file = NULL;
if (md_get_certificate) {
rv = md_get_certificate(s, p, &key_file, &cert_file);
@@ -1780,11 +1780,11 @@
if (key_file && cert_file) {
ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, s,
- "%s: installing key=%s, cert=%s, chain=%s",
- ssl_util_vhostid(p, s), key_file, cert_file,
chain_file);
+ "%s: installing key=%s, cert=%s",
+ ssl_util_vhostid(p, s), key_file, cert_file);
APR_ARRAY_PUSH(pks->key_files, const char *) = key_file;
APR_ARRAY_PUSH(pks->cert_files, const char *) = cert_file;
- sc->server->cert_chain = chain_file;
+ sc->server->cert_chain = NULL;
}
if (APR_STATUS_IS_EAGAIN(rv)) {
