From 6e2be481fd82e24571c691e015e5d6fd7a6a9c33 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Wed, 29 Nov 2023 18:34:45 +0400 Subject: [PATCH] Dropped the root param from ItemResponse::build() --- src/server/internalServer.cpp | 6 +++--- src/server/response.cpp | 2 +- src/server/response.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 7c710b488..8cfcebe26 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -1143,7 +1143,7 @@ std::unique_ptr InternalServer::handle_content(const RequestContext& r // '-' namespaces, in which case that resource is returned instead. return build_redirect(bookName, getFinalItem(*archive, entry)); } - auto response = ItemResponse::build(m_root, request, entry.getItem()); + auto response = ItemResponse::build(request, entry.getItem()); response->set_etag_body(archiveUuid); if ( !startsWith(entry.getItem().getMimetype(), "application/pdf") ) { @@ -1215,7 +1215,7 @@ std::unique_ptr InternalServer::handle_raw(const RequestContext& reque try { if (kind == "meta") { auto item = archive->getMetadataItem(itemPath); - auto response = ItemResponse::build(m_root, request, item); + auto response = ItemResponse::build(request, item); response->set_etag_body(archiveUuid); return response; } else { @@ -1223,7 +1223,7 @@ std::unique_ptr InternalServer::handle_raw(const RequestContext& reque if (entry.isRedirect()) { return build_redirect(bookName, entry.getItem(true)); } - auto response = ItemResponse::build(m_root, request, entry.getItem()); + auto response = ItemResponse::build(request, entry.getItem()); response->set_etag_body(archiveUuid); return response; } diff --git a/src/server/response.cpp b/src/server/response.cpp index f4d1ea17c..304a1b7e3 100644 --- a/src/server/response.cpp +++ b/src/server/response.cpp @@ -422,7 +422,7 @@ ItemResponse::ItemResponse(const zim::Item& item, const std::string& mimetype, c add_header(MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType); } -std::unique_ptr ItemResponse::build(const std::string& root, const RequestContext& request, const zim::Item& item) +std::unique_ptr ItemResponse::build(const RequestContext& request, const zim::Item& item) { const std::string mimetype = get_mime_type(item); auto byteRange = request.get_range().resolve(item.getSize()); diff --git a/src/server/response.h b/src/server/response.h index f57ab9345..4707ed8ea 100644 --- a/src/server/response.h +++ b/src/server/response.h @@ -193,7 +193,7 @@ private: // overrides class ItemResponse : public Response { public: ItemResponse(const zim::Item& item, const std::string& mimetype, const ByteRange& byterange); - static std::unique_ptr build(const std::string& root, const RequestContext& request, const zim::Item& item); + static std::unique_ptr build(const RequestContext& request, const zim::Item& item); private: MHD_Response* create_mhd_response(const RequestContext& request);