summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Barksdale <amatus.amongus@gmail.com>2014-07-03 20:11:03 +0000
committerDavid Barksdale <amatus.amongus@gmail.com>2014-07-03 20:11:03 +0000
commit5eaaab6d7d679e9412e5dad363ea849b70c5569e (patch)
tree977c7021af5d13c034c7435bd41f99776cf32795
parentd1ba9ac87f65a748d6e064bff6393eb13b329403 (diff)
Require libmicrohttpd >= 0.9.32
We are using suspend/resume features for plugin_transport_http_server which were added in 0.9.32.
-rw-r--r--configure.ac12
-rw-r--r--src/transport/plugin_transport_http_server.c6
2 files changed, 8 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index d90462329..6eb0d0375 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,11 +829,11 @@ AC_ARG_WITH(microhttpd,
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
- [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+ [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include "$native_srcdir/src/include/platform.h"
#include <microhttpd.h>
- int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+ int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
])], [
AC_MSG_RESULT(ok)
lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -848,11 +848,11 @@ AC_ARG_WITH(microhttpd,
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH"
- [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+ [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include "$native_srcdir/src/include/platform.h"
#include <microhttpd.h>
- int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+ int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
])], [
AC_MSG_RESULT(ok)
lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
@@ -866,11 +866,11 @@ AC_ARG_WITH(microhttpd,
AC_CHECK_HEADERS([microhttpd.h],
AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT,
AC_CHECK_LIB([microhttpd], [MHD_start_daemon],
- [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31])
+ [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32])
AC_RUN_IFELSE([AC_LANG_SOURCE([
#include "$native_srcdir/src/include/platform.h"
#include <microhttpd.h>
- int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; }
+ int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; }
])], [
AC_MSG_RESULT(ok)
lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]),
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index d8ed313b6..f0ea5263f 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2223,10 +2223,8 @@ server_start (struct HTTP_Server_Plugin *plugin)
#if BUILD_HTTPS
MHD_USE_SSL |
#endif
-#ifdef MHD_USE_SUSPEND_RESUME
- MHD_USE_SUSPEND_RESUME |
-#endif
- MHD_NO_FLAG, plugin->port,
+ MHD_USE_SUSPEND_RESUME,
+ plugin->port,
&server_accept_cb, plugin,
&server_access_cb, plugin,
MHD_OPTION_SOCK_ADDR,