strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

allow testing wasm in non-debug mode

Browse source 
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I583a8104f590e26a76837bef00814684e2015c7a
This commit is contained in:
Caolán McNamara 2023-11-27 11:51:03 +00:00 committed by Caolán McNamara
parent bb2df24d1b
commit 48002c5d40
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coolwsd.xml.in
View file

@ -310,7 +310,7 @@
<wasm desc="WASM-specific settings">
<enable desc="Enable WASM support" type="bool" default="false"></enable>
<force desc="When enabled, all requests are redirected to WASM. Only valid in debug builds." type="bool" default="false"></force>
<force desc="When enabled, all requests are redirected to WASM." type="bool" default="false"></force>
</wasm>
</config>

2
wsd/COOLWSD.cpp
View file

@ -2393,7 +2393,6 @@ void COOLWSD::innerInitialize(Application& self)
? COOLWSD::WASMActivationState::Enabled
: COOLWSD::WASMActivationState::Disabled;
#if ENABLE_DEBUG
if (getConfigValue<bool>(conf, "wasm.force", false))
{
if (COOLWSD::WASMState != COOLWSD::WASMActivationState::Enabled)
@ -2407,7 +2406,6 @@ void COOLWSD::innerInitialize(Application& self)
LOG_INF("WASM is force-enabled. All documents will be loaded through WASM");
COOLWSD::WASMState = COOLWSD::WASMActivationState::Forced;
}
#endif
// Get anonymization settings.
#if COOLWSD_ANONYMIZE_USER_DATA

2
wsd/FileServer.cpp
View file

@ -931,7 +931,6 @@ std::string FileServerRequestHandler::getRequestPathname(const HTTPRequest& requ
Poco::replaceInPlace(path, std::string("/browser" + gitHash), std::string("/browser/dist/"));
}
#if ENABLE_DEBUG
if (COOLWSD::WASMState == COOLWSD::WASMActivationState::Forced)
{
if (path.find("/browser/dist/wasm/") == std::string::npos)
@ -940,7 +939,6 @@ std::string FileServerRequestHandler::getRequestPathname(const HTTPRequest& requ
std::string("/browser/dist/wasm/"));
}
}
#endif
return path;
}