From 58d3c6ca0854013712b8aadfea90c825e95357b0 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sat, 28 Jul 2018 19:41:55 +0200 Subject: [PATCH] Redirects --- src/client.cpp | 6 ++---- src/necronda-server.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 6ed3330..682cbf4 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -192,12 +192,10 @@ bool connection_handler(const char *preprefix, const char *col1, const char *col bool redir = true; if (!noRedirect) { - if (host == "necronda.net") { - req.redirect(303, "https://www.necronda.net/"); + if (getWebRoot(host).empty()) { + req.redirect(303, "https://www.necronda.net" + req.getPath()); } else if (socket->getSocketPort() != 443) { req.redirect(303, "https://" + host + req.getPath()); - } else if (getWebRoot(host).empty()) { - req.redirect(303, "https://www.necronda.net" + req.getPath()); } else { redir = false; } diff --git a/src/necronda-server.cpp b/src/necronda-server.cpp index 14cce50..8b52b5c 100644 --- a/src/necronda-server.cpp +++ b/src/necronda-server.cpp @@ -195,7 +195,7 @@ string getWebRoot(string host) { if (fileExists(root)) { return root; } else { - return "/"; + return ""; } }