summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-05-28 20:08:37 +0100
committerSadie Powell <sadie@witchery.services>2021-05-28 20:08:37 +0100
commit83bb6951fe4a6d3e394327b18badfc846d2e8204 (patch)
tree814e8c5da44ed4b6799b6c95b3df73a6d53274b9
parent071499a22cbf7132ddf9f5a5d804c92b4273f806 (diff)
Avoid registering services as their unprefixed name.
This fixes SSL profiles overriding the websocket module.
-rw-r--r--src/modules.cpp3
1 files changed, 2 insertions, 1 deletions
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;
}