summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean DuBois <sean@siobud.com>2016-06-26 02:13:36 -0500
committerDan Winship <danw@gnome.org>2016-07-12 13:42:48 -0400
commitecce791a3f026d495e41dc20b89f833ba262b9b0 (patch)
treedb6335c0030889ffb458926ea0cdf1428d0bf95d
parent72c5759b4cd1e2e9e619ed1ca0c4d5e43d0b444b (diff)
downloadlibsoup-ecce791a3f026d495e41dc20b89f833ba262b9b0.tar.gz
Fix soup_server_set_ssl_cert_file
The arguments ssl_key_file/ssl_cert_file was never copied to SoupServerPrivate causing latter SSL logic to use NULL values.
-rw-r--r--libsoup/soup-server.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 5783ccb5..65f72a41 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -1015,6 +1015,13 @@ soup_server_set_ssl_cert_file (SoupServer *server,
if (priv->tls_cert)
g_object_unref (priv->tls_cert);
+
+ g_free (priv->ssl_cert_file);
+ priv->ssl_cert_file = g_strdup (ssl_cert_file);
+
+ g_free (priv->ssl_key_file);
+ priv->ssl_key_file = g_strdup (ssl_key_file);
+
priv->tls_cert = g_tls_certificate_new_from_files (priv->ssl_cert_file,
priv->ssl_key_file,
error);