From c0af883bf9517670d7b729b23baeb5346766ed45 Mon Sep 17 00:00:00 2001 From: Alex Hultman Date: Wed, 26 Dec 2018 14:47:18 +0100 Subject: [PATCH] Pull new uSockets with SSL fixes --- misc/main.cpp | 4 ++-- uSockets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/main.cpp b/misc/main.cpp index 009efb3..fa5a87d 100644 --- a/misc/main.cpp +++ b/misc/main.cpp @@ -15,11 +15,11 @@ int main(int argc, char **argv) { const char *passphrase; const char *dh_params_file_name;*/ - uWS::/*SSL*/App(/*{ + uWS::SSLApp({ "/home/alexhultman/key.pem", "/home/alexhultman/cert.pem", "1234" - }*/).get("/hello", [](auto *res, auto *req) { + }).get("/hello", [](auto *res, auto *req) { res->end("Hello HTTP!"); }).ws("/*", { /* Settings */ diff --git a/uSockets b/uSockets index 215c6d4..6aaa9de 160000 --- a/uSockets +++ b/uSockets @@ -1 +1 @@ -Subproject commit 215c6d474428c3a770bdc8b5e428abcc337dc754 +Subproject commit 6aaa9deccfe12bf7fd8b0a8b9c6306b858c7a6e2