summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJonas Suhr Christensen <jsc@umbraculum.org>2013-12-06 11:48:27 +0100
committerJonas Suhr Christensen <jsc@umbraculum.org>2013-12-06 11:48:27 +0100
commit1275df02ea196693d4783c75f221ba43c9d51cc0 (patch)
treee14a15ab7c4fd9a608bed8ee4f8f2c7c70dea4b7 /src
parent36133cfb4bbde6a7f391eea592909df3ef4eb152 (diff)
parent79e15d44e838e41f345de29761dbd18ad8f37dd8 (diff)
Merge branch 'master' of https://git.oftal.dk/munia
Diffstat (limited to 'src')
-rw-r--r--src/muniad.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/muniad.cc b/src/muniad.cc
index 995bb67..b478484 100644
--- a/src/muniad.cc
+++ b/src/muniad.cc
@@ -128,13 +128,15 @@ int main(int argc, char **argv)
info.protocols = protocols;
info.extensions = libwebsocket_get_internal_extensions();
- //if (!use_ssl) {
- info.ssl_cert_filepath = cert_path;
- info.ssl_private_key_filepath = NULL;
- //} else {
- // info.ssl_cert_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
- // info.ssl_private_key_filepath = LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
-//}
+ if (!use_ssl) {
+ info.ssl_cert_filepath = cert_path;
+ info.ssl_private_key_filepath = NULL;
+ } else {
+ info.ssl_cert_filepath =
+ LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem";
+ info.ssl_private_key_filepath =
+ LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem";
+ }
info.gid = -1;
info.uid = -1;