Update to libmicrohttpd 0.9.52

Ubuntu · Ubuntu · commit b6d0976694c4 · 2017-02-12T14:15:20.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Wed Feb 12 13:14:01 2017 +0000
+	Updated to libmicrohttpd 0.9.52
+
 Wed Jul 13 02:23:11 2016 +0100
 	Fixed problems with large payloads
 	Fixed memory leak in http_response_ptr
diff --git a/configure.ac b/configure.ac
@@ -21,8 +21,8 @@
 
 AC_PREREQ(2.57)
 m4_define([libhttpserver_MAJOR_VERSION],[0])dnl
-m4_define([libhttpserver_MINOR_VERSION],[11])dnl
-m4_define([libhttpserver_REVISION],[1])dnl
+m4_define([libhttpserver_MINOR_VERSION],[12])dnl
+m4_define([libhttpserver_REVISION],[0])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])
@@ -92,17 +92,17 @@ AC_CHECK_HEADER([gnutls/gnutls.h],[have_gnutls="yes"],[AC_MSG_WARN("gnutls/gnutl
 # Checks for libmicrohttpd
 AC_CHECK_HEADER([microhttpd.h],
     AC_CHECK_LIB([microhttpd], [MHD_get_fdset2],
-        [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.37])
+        [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.52])
             AC_COMPILE_IFELSE(
                 [AC_LANG_SOURCE([
                     #include <microhttpd.h>
-                    #if (MHD_VERSION < 0x0093700)
-                    #error needs at least version 0.9.37
+                    #if (MHD_VERSION < 0x00095102)
+                    #error needs at least version 0.9.52
                     #endif
                     int main () { return 0; }
                 ])],
             [],
-            [AC_MSG_ERROR("libmicrohttpd is too old - install libmicrohttpd >= 0.9.37")]
+            [AC_MSG_ERROR("libmicrohttpd is too old - install libmicrohttpd >= 0.9.52")]
             )
         ],
         [AC_MSG_ERROR(["libmicrohttpd not found"])]
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -79,8 +79,7 @@ const int http_utils::http_payment_required = MHD_HTTP_PAYMENT_REQUIRED;
 const int http_utils::http_forbidden = MHD_HTTP_FORBIDDEN;
 const int http_utils::http_not_found = MHD_HTTP_NOT_FOUND;
 const int http_utils::http_method_not_allowed = MHD_HTTP_METHOD_NOT_ALLOWED;
-const int http_utils::http_method_not_acceptable =
-    MHD_HTTP_METHOD_NOT_ACCEPTABLE;
+const int http_utils::http_method_not_acceptable = MHD_HTTP_NOT_ACCEPTABLE;
 const int http_utils::http_proxy_authentication_required =
     MHD_HTTP_PROXY_AUTHENTICATION_REQUIRED;
 const int http_utils::http_request_timeout = MHD_HTTP_REQUEST_TIMEOUT;
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -79,7 +79,7 @@ class http_utils
 #if defined(__MINGW32__) || defined(__CYGWIN32__)
         INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL,
 #else
-        INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_EPOLL_TURBO, 
+        INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO, 
 #endif
         THREAD_PER_CONNECTION = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
     };
