smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #827 from kiwix/http_redirect_new_logic 

New logic for generating HTTP-redirects
This commit is contained in:
Matthieu Gautier 2022-10-04 16:04:20 +02:00 committed by GitHub
parent f6ae75e41d 582c8d868a
commit cd6cbe3655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/internalServer.cpp
View File

@ -1043,9 +1043,14 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
try { try {
auto entry = getEntryFromPath(*archive, urlStr); auto entry = getEntryFromPath(*archive, urlStr);
if (entry.isRedirect() || urlStr.empty()) { if (entry.isRedirect() || urlStr != entry.getPath()) {
// If urlStr is empty, we want to mainPage. // In the condition above, the second case (an entry with a different
// We must do a redirection to the real page. // URL was returned) can occur in the following situations:
// 1. urlStr is empty or equal to "/" and the ZIM file doesn't contain
// such an entry, in which case the main entry is returned instead.
// 2. The ZIM file uses old namespace scheme, and the resource at urlStr
// is not present but can be found under one of the 'A', 'I', 'J' or
// '-' namespaces, in which case that resource is returned instead.
return build_redirect(bookName, getFinalItem(*archive, entry)); return build_redirect(bookName, getFinalItem(*archive, entry));
} }
auto response = ItemResponse::build(*this, request, entry.getItem()); auto response = ItemResponse::build(*this, request, entry.getItem());