diff options
| author | Dan Engelbrecht <[email protected]> | 2024-11-28 15:03:20 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-11-28 15:03:20 +0100 |
| commit | e7c55832e081a4044e2fbcd40bd131da3e539e52 (patch) | |
| tree | e166446b0b6ea6039cb1ce79571be90d2e146bb2 | |
| parent | Fixed release mirror on new release (#243) (diff) | |
| download | zen-e7c55832e081a4044e2fbcd40bd131da3e539e52.tar.xz zen-e7c55832e081a4044e2fbcd40bd131da3e539e52.zip | |
set content type correctly for getchunkrange (#241)
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/zenserver/projectstore/projectstore.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 67241e010..1db11dfdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ ## +- Bugfix: Fix returned content type when requesting a project store chunk with non-compressed accept type + +## 5.5.14 - Feature: Added `--malloc` option for selecting which memory allocator should be used. Currently the available options are `--malloc=mimalloc`, `--malloc=rpmalloc`, `--malloc=stomp` or `--malloc=ansi`. Some of these options are currently not available on all targets, but all are available on Windows. `rpmalloc` is currently not supported on Linux or Mac due to toolchain limitations. - Feature: Added support for generating Unreal Insights-compatible traces for memory usage analysis. Currently only supported for Windows. Activate memory tracing by passing `--trace=memory` on the command line, alongside one of `--tracehost=<ip>` or `--tracefile=<path>` to enable tracing over network or to a file. - Feature: Self-hosted dashboard displays oplog entry package data sizes in tree and entry view pages diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index 4de812f7e..6f669f68e 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -4355,12 +4355,12 @@ ProjectStore::GetChunkRange(const std::string_view ProjectId, { if (AcceptType == ZenContentType::kBinary) { - OutChunk = Compressed.DecompressToComposite(); + OutChunk = Compressed.DecompressToComposite(); + OutContentType = ZenContentType::kBinary; } else { - OutChunk = Compressed.GetCompressed(); - OutContentType = ZenContentType::kCompressedBinary; + OutChunk = Compressed.GetCompressed(); } } } |