From c91df1cb269f4dde3520cc5e41fbccbeebd761de Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Sun, 9 Oct 2022 22:18:14 +0400
Subject: [PATCH] Two private funcs of InternalServer became free

---
 src/server/internalServer.cpp | 36 +++++++++++++++++------------------
 src/server/internalServer.h   |  2 --
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index 0583ba016..50606db4c 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -218,6 +218,24 @@ struct CustomizedResourceData
   std::string resourceFilePath;
 };
 
+bool etag_not_needed(const RequestContext& request)
+{
+  const std::string url = request.get_url();
+  return kiwix::startsWith(url, "/skin")
+      || url == "/random";
+}
+
+ETag
+get_matching_if_none_match_etag(const RequestContext& r, const std::string& etagBody)
+{
+  try {
+    const std::string etag_list = r.get_header(MHD_HTTP_HEADER_IF_NONE_MATCH);
+    return ETag::match(etag_list, etagBody);
+  } catch (const std::out_of_range&) {
+    return ETag();
+  }
+}
+
 } // unnamed namespace
 
 std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const RequestContext& request) const
@@ -605,24 +623,6 @@ MustacheData InternalServer::get_default_data() const
   return data;
 }
 
-bool InternalServer::etag_not_needed(const RequestContext& request) const
-{
-  const std::string url = request.get_url();
-  return kiwix::startsWith(url, "/skin")
-      || url == "/random";
-}
-
-ETag
-InternalServer::get_matching_if_none_match_etag(const RequestContext& r, const std::string& etagBody) const
-{
-  try {
-    const std::string etag_list = r.get_header(MHD_HTTP_HEADER_IF_NONE_MATCH);
-    return ETag::match(etag_list, etagBody);
-  } catch (const std::out_of_range&) {
-    return ETag();
-  }
-}
-
 std::unique_ptr<Response> InternalServer::build_homepage(const RequestContext& request)
 {
   return ContentResponse::build(*this, m_indexTemplateString, get_default_data(), "text/html; charset=utf-8");
diff --git a/src/server/internalServer.h b/src/server/internalServer.h
index 48fab9c39..f6b7c3116 100644
--- a/src/server/internalServer.h
+++ b/src/server/internalServer.h
@@ -147,8 +147,6 @@ class InternalServer {
 
     MustacheData get_default_data() const;
 
-    bool etag_not_needed(const RequestContext& r) const;
-    ETag get_matching_if_none_match_etag(const RequestContext& request, const std::string& etagBody) const;
     std::pair<std::string, Library::BookIdSet> selectBooks(const RequestContext& r) const;
     SearchInfo getSearchInfo(const RequestContext& r) const;