646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
16 lines
600 B
Diff
16 lines
600 B
Diff
In the nix build, COOLWSD_VERSION_HASH becomes the same as COOLWSD_VERSION, e.g.
|
|
`24.04.3.5`. The web server that serves files from
|
|
`/browser/$COOLWSD_VERSION_HASH`, doesn't expect the hash to contain dots.
|
|
|
|
--- a/wsd/FileServer.cpp
|
|
+++ b/wsd/FileServer.cpp
|
|
@@ -933,7 +933,7 @@ std::string FileServerRequestHandler::getRequestPathname(const HTTPRequest& requ
|
|
|
|
std::string path(requestUri.getPath());
|
|
|
|
- Poco::RegularExpression gitHashRe("/([0-9a-f]+)/");
|
|
+ Poco::RegularExpression gitHashRe("/([0-9a-f.]+)/");
|
|
std::string gitHash;
|
|
if (gitHashRe.extract(path, gitHash))
|
|
{
|