From 9fd1423100c773c2c9a15e0b4e673df05aa00ac9 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Sun, 9 Oct 2022 22:46:31 +0400
Subject: [PATCH] Small clean-up

---
 src/server/internalServer.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index c28306a82..2f65586b5 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -218,11 +218,11 @@ struct CustomizedResourceData
   std::string resourceFilePath;
 };
 
-bool etag_not_needed(const RequestContext& request)
+bool responseMustBeETaggedWithLibraryId(const Response& response, const RequestContext& request)
 {
-  const std::string url = request.get_url();
-  return kiwix::startsWith(url, "/skin")
-      || url == "/random";
+  return response.getReturnCode() == MHD_HTTP_OK
+      && response.get_kind() == Response::DYNAMIC_CONTENT
+      && request.get_url() != "/random";
 }
 
 ETag
@@ -528,10 +528,9 @@ MHD_Result InternalServer::handlerCallback(struct MHD_Connection* connection,
     }
   }
 
-  if (response->getReturnCode() == MHD_HTTP_OK
-      && response->get_kind() == Response::DYNAMIC_CONTENT
-      && !etag_not_needed(request))
+  if ( responseMustBeETaggedWithLibraryId(*response, request) ) {
     response->set_etag_body(getLibraryId());
+  }
 
   auto ret = response->send(request, connection);
   auto end_time = std::chrono::steady_clock::now();