From 83bb6951fe4a6d3e394327b18badfc846d2e8204 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 28 May 2021 20:08:37 +0100 Subject: Avoid registering services as their unprefixed name. This fixes SSL profiles overriding the websocket module. --- src/modules.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules.cpp b/src/modules.cpp index f2c6cde24..bad788fe9 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -599,9 +599,10 @@ void ModuleManager::AddService(ServiceProvider& item) std::string::size_type slash = item.name.find('/'); if (slash != std::string::npos) { + // Also register foo/bar as foo. DataProviders.insert(std::make_pair(item.name.substr(0, slash), &item)); - DataProviders.insert(std::make_pair(item.name.substr(slash + 1), &item)); } + dynamic_reference_base::reset_all(); break; } -- cgit v1.2.3