Merge pull request #278 from kiwix/fix_server

Fix server
New version 1.2.1
2026-01-17 10:27:44 -05:00 · 2019-04-16 14:37:58 +02:00 · 2019-04-16 14:30:54 +02:00 · 2019-04-16 14:29:06 +02:00
4 changed files with 23 additions and 4 deletions
--- a/8
+++ b/8
@@ -1,3 +1,11 @@
+kiwix-tools 1.2.1
+=================
+
+kiwix-serve
+-----------
+
+ * Always use POLL when avaible.
+
 kiwix-tools 1.2.0
 =================

--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer Emmanuel Engelhart <kelson@kiwix.org>
 # Install kiwix-serve
 WORKDIR /
 RUN apk add --no-cache curl bzip2
-RUN curl -kL https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-x86_64-1.1.0.tar.gz | tar -xz && \
+RUN curl -kL https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-x86_64-1.2.1.tar.gz | tar -xz && \
    mv kiwix-tools*/kiwix-serve /usr/local/bin && \
    rm -r kiwix-tools*

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('kiwix-tools', 'cpp',
-  version : '1.2.0',
+  version : '1.2.1',
  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
@@ -1270,7 +1270,10 @@ int main(int argc, char** argv)
      exit(1);
    }

-    daemon = MHD_start_daemon(MHD_USE_POLL_INTERNALLY,
+    int flags = MHD_USE_POLL_INTERNALLY;
+    if (isVerbose.load())
+        flags |= MHD_USE_DEBUG;
+    daemon = MHD_start_daemon(flags,
                              serverPort,
                              NULL,
                              NULL,
@@ -1285,7 +1288,15 @@ int main(int argc, char** argv)
 #endif

  } else {
-    daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY,
+#ifdef _WIN32
+    int flags = MHD_USE_SELECT_INTERNALLY;
+#else
+    int flags = MHD_USE_POLL_INTERNALLY;
+#endif
+    if (isVerbose.load())
+        flags |= MHD_USE_DEBUG;
+
+    daemon = MHD_start_daemon(flags,
                              serverPort,
                              NULL,
                              NULL,
Author	SHA1	Message	Date
Matthieu Gautier	68ac06c397	Merge pull request #278 from kiwix/fix_server Fix server	2019-04-16 14:37:58 +02:00
Matthieu Gautier	99f6941614	New version 1.2.1	2019-04-16 14:30:54 +02:00
Matthieu Gautier	848d058610	Always use POLL wen possible. SELECT works only with fd < 1024. If we've got "too many" zim files, the fd of the socket is > 1024 and we cannot create the daemon. Also add the MHD_USE_DEBUG flag when we are verbose. Fix #277	2019-04-16 14:29:06 +02:00