Merge pull request #260 from kiwix/new_version

New version 1.0.0
2026-01-25 06:20:27 -05:00 · 2019-02-22 11:19:03 +01:00 · 2019-02-22 10:50:33 +01:00 · 2019-02-20 17:14:52 +01:00 · 2019-02-20 16:57:10 +01:00 · 2019-02-20 16:46:19 +01:00
4 changed files with 29 additions and 24 deletions
--- a/14
+++ b/14
@@ -1,3 +1,17 @@
+kiwix-tools 1.0.0
+=================
+
+ * [CI] Use the new deps archive xz
+ * Move version 1.0.0. There is no need to stay in pre 1.0 version.
+
+kiwix-serve
+-----------
+
+ * Correctly implement redirection.
+   kiwix-serve now return a 302 http status code instead of resolving the
+   redirection internally and return the content.
+
+
 kiwix-tools 0.9.0
 =================

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '0.9.0',
+  version : '1.0.0',
  license : 'GPL',
  default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -766,10 +766,22 @@ static struct MHD_Response* handle_content(RequestContext* request)
  }

  auto urlStr = request->get_url().substr(humanReadableBookId.size()+1);
+  if (urlStr[0] == '/') {
+    urlStr = urlStr.substr(1);
+  }

  try {
    entry = reader->getEntryFromPath(urlStr);
-    entry = entry.getFinalEntry();
+    if (entry.isRedirect() || urlStr.empty()) {
+      // If urlStr is empty, we want to mainPage.
+      // We must do a redirection to the real page.
+      entry = entry.getFinalEntry();
+      std::string httpRedirection = (
+        rootLocation + "/" + humanReadableBookId + "/" +
+        kiwix::urlEncode(entry.getPath()));
+      request->httpResponseCode = MHD_HTTP_FOUND;
+      return build_response("", 0, httpRedirection, "", false, false);
+    }
  } catch(kiwix::NoEntry& e) {
    if (isVerbose.load())
      printf("Failed to find %s\n", urlStr.c_str());
@@ -794,29 +806,8 @@ static struct MHD_Response* handle_content(RequestContext* request)
    zim::Blob raw_content = entry.getBlob();
    content = string(raw_content.data(), raw_content.size());

-    /* Special rewrite URL in case of ZIM file use intern *asbolute* url like
-     * /A/Kiwix */
    if (mimeType.find("text/html") != string::npos) {
-      baseUrl = "/" + entry.getPath();
-      pthread_mutex_lock(&regexLock);
-      content = replaceRegex(content,
-                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
-                             "(href|src)(=[\"|\']{0,1})/([A-Z|\\-])/");
-      content = replaceRegex(content,
-                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
-                             "(@import[ ]+)([\"|\']{0,1})/([A-Z|\\-])/");
-      content = replaceRegex(
-          content,
-          "<head><base href=\"" + rootLocation + "/" + humanReadableBookId + baseUrl + "\" />",
-          "<head>");
-      pthread_mutex_unlock(&regexLock);
      introduceTaskbar(content, humanReadableBookId);
-    } else if (mimeType.find("text/css") != string::npos) {
-      pthread_mutex_lock(&regexLock);
-      content = replaceRegex(content,
-                             "$1$2" + rootLocation + "/" + humanReadableBookId + "/$3/",
-                             "(url|URL)(\\([\"|\']{0,1})/([A-Z|\\-])/");
-      pthread_mutex_unlock(&regexLock);
    }

    bool deflated
--- a/travis/install_deps.sh
+++ b/travis/install_deps.sh
@@ -3,7 +3,7 @@
 set -e

 REPO_NAME=${TRAVIS_REPO_SLUG#*/}
-ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
+ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.xz

 # Packages.
 case ${PLATFORM} in
Author	SHA1	Message	Date
Matthieu Gautier	e4eafd7459	Merge pull request #260 from kiwix/new_version New version 1.0.0	2019-02-22 11:19:03 +01:00
Matthieu Gautier	16a29127a1	New version 1.0.0	2019-02-22 10:50:33 +01:00
Matthieu Gautier	7fa0579ea1	Merge pull request #258 from kiwix/redirect [server] Correctly implement 302 redirection if the entry is a redirection	2019-02-20 17:14:52 +01:00
Matthieu Gautier	978dc47865	[server] Correctly implement 302 redirection if the entry is a redirection. If the entry is a redirection, we should redirect the client to the right entry instead of serving the target content. As we are doing a redirection, urls are good and we don't have to change link inside the html or css content. Fix #192	2019-02-20 16:57:10 +01:00
Matthieu Gautier	b7793f6e75	Merge pull request #259 from kiwix/use_correct_dep_archive Use new xz archive	2019-02-20 16:46:19 +01:00
Matthieu Gautier	8095ae9ea8	Use new xz archive	2019-02-20 16:06:04 +01:00