Updated the library to use latest libmicrohttpd improvements

Sebastiano Merlino · Sebastiano Merlino · commit a73055165b18 · 2015-12-27T19:42:27.000+01:00
* Removed POLL start config. Now THREAD defaults to POLL on windows
and EPOLL on linux
* Use TCP_FASTOPEN on linux &gt;= 3.6o
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 27 19:39:01 2016 +0100
+	Removed POLL start configuration (THREAD now defaults to POLL or EPOLL on Linux)
+	Use TCP_FASTOPEN on linux >= 3.6
+
 Sat Jan 26 15:08:22 2016 +0100
 	Changed http_resource to use classic C++ polymorphism using virtual instead of CRTP
 
diff --git a/configure.ac b/configure.ac
@@ -22,7 +22,7 @@
 AC_PREREQ(2.57)
 m4_define([libhttpserver_MAJOR_VERSION],[0])dnl
 m4_define([libhttpserver_MINOR_VERSION],[10])dnl
-m4_define([libhttpserver_REVISION],[0])dnl
+m4_define([libhttpserver_REVISION],[1])dnl
 m4_define([libhttpserver_PKG_VERSION],[libhttpserver_MAJOR_VERSION.libhttpserver_MINOR_VERSION.libhttpserver_REVISION])dnl
 m4_define([libhttpserver_LDF_VERSION],[libhttpserver_MAJOR_VERSION:libhttpserver_MINOR_VERSION:libhttpserver_REVISION])dnl
 AC_INIT([libhttpserver], libhttpserver_PKG_VERSION, [electrictwister2000@gmail.com])
@@ -56,19 +56,21 @@ if test x"$samedirectory" = x"no"; then
     fi
 fi
 
+is_windows=yes;
 case "$host" in
     *-mingw*)
-	    NETWORK_HEADER="winsock2.h"
-		REGEX_LIBS="-lregex -lpthread -no-undefined"
+        NETWORK_HEADER="winsock2.h"
+        REGEX_LIBS="-lregex -lpthread -no-undefined"
         native_srcdir=$(cd $srcdir; pwd -W)
         ;;
     *-cygwin*)
-	    NETWORK_HEADER="winsock2.h"
-		REGEX_LIBS="-lregex -lpthread -no-undefined"
+        NETWORK_HEADER="winsock2.h"
+        REGEX_LIBS="-lregex -lpthread -no-undefined"
         ;;
     *)
-	    NETWORK_HEADER="arpa/inet.h"
-		REGEX_LIBS=""
+        NETWORK_HEADER="arpa/inet.h"
+        REGEX_LIBS=""
+        is_windows=no
         ;;
 esac
 
@@ -111,6 +113,14 @@ AC_CHECK_HEADER([microhttpd.h],
 CXXFLAGS="-DHTTPSERVER_COMPILATION -D_REENTRANT $LIBMICROHTTPD_CFLAGS $CXXFLAGS"
 LDFLAGS="$LIBMICROHTTPD_LIBS $REGEX_LIBS $LD_FLAGS"
 
+if test x"$is_windows" = x"no"; then
+    if test `uname -r |cut -d. -f1` -ge 3; then
+        if test `uname -r |cut -d. -f2` -ge 6; then
+            CXXFLAGS="-DUSE_FASTOPEN $CXXFLAGS"
+        fi
+    fi
+fi
+
 m4_pattern_allow([AC_TYPE_SIZE_T])
 m4_pattern_allow([AC_TYPE_UINT16_T])
 m4_pattern_allow([AC_TYPE_UINT32_T])
diff --git a/debian/changelog.in b/debian/changelog.in
@@ -1,3 +1,9 @@
+libhttpserver (0.10.1) unstable; urgency=low
+    * Removed POLL start configuration (THREAD now defaults to POLL or EPOLL on Linux)
+    * Use TCP_FASTOPEN on linux >= 3.6
+
+ -- Sebastiano Merlino <electrictwister2000@gmail.com> Sat, 27 Jan 2016 19:39:01 +0100
+
 libhttpserver (0.10.0) unstable; urgency=low
     * Changed http_resource to use classic C++ polymorphism using virtual instead of CRTP
 
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -77,8 +77,11 @@ class http_utils
     enum start_method_T
     {
         INTERNAL_SELECT = MHD_NO_FLAG,
-        THREADS = MHD_USE_THREAD_PER_CONNECTION,
-        POLL = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
+#if defined(__MINGW32__) || defined(__CYGWIN32__)
+        THREAD = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
+#else
+        THREAD = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_EPOLL_LINUX_ONLY
+#endif
     };
 
     enum policy_T
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -547,6 +547,10 @@ bool webserver::start(bool blocking)
     if(pedantic)
         start_conf |= MHD_USE_PEDANTIC_CHECKS;
 
+#ifdef USE_FASTOPEN
+    start_conf |= MHD_USE_TCP_FASTOPEN;
+#endif
+
     int num_threads = 1;
     if(max_threads > num_threads)
         num_threads = max_threads;
