diff options
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 6 |
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, | |||
829 | AC_CHECK_HEADERS([microhttpd.h], | 829 | AC_CHECK_HEADERS([microhttpd.h], |
830 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 830 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
831 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], | 831 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], |
832 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31]) | 832 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) |
833 | AC_RUN_IFELSE([AC_LANG_SOURCE([ | 833 | AC_RUN_IFELSE([AC_LANG_SOURCE([ |
834 | #include "$native_srcdir/src/include/platform.h" | 834 | #include "$native_srcdir/src/include/platform.h" |
835 | #include <microhttpd.h> | 835 | #include <microhttpd.h> |
836 | int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; } | 836 | int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } |
837 | ])], [ | 837 | ])], [ |
838 | AC_MSG_RESULT(ok) | 838 | AC_MSG_RESULT(ok) |
839 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), | 839 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), |
@@ -848,11 +848,11 @@ AC_ARG_WITH(microhttpd, | |||
848 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 848 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
849 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], | 849 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], |
850 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" | 850 | EXT_LIB_PATH="-L$with_microhttpd/lib $EXT_LIB_PATH" |
851 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31]) | 851 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) |
852 | AC_RUN_IFELSE([AC_LANG_SOURCE([ | 852 | AC_RUN_IFELSE([AC_LANG_SOURCE([ |
853 | #include "$native_srcdir/src/include/platform.h" | 853 | #include "$native_srcdir/src/include/platform.h" |
854 | #include <microhttpd.h> | 854 | #include <microhttpd.h> |
855 | int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; } | 855 | int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } |
856 | ])], [ | 856 | ])], [ |
857 | AC_MSG_RESULT(ok) | 857 | AC_MSG_RESULT(ok) |
858 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), | 858 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), |
@@ -866,11 +866,11 @@ AC_ARG_WITH(microhttpd, | |||
866 | AC_CHECK_HEADERS([microhttpd.h], | 866 | AC_CHECK_HEADERS([microhttpd.h], |
867 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, | 867 | AC_CHECK_DECL(MHD_OPTION_PER_IP_CONNECTION_LIMIT, |
868 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], | 868 | AC_CHECK_LIB([microhttpd], [MHD_start_daemon], |
869 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.31]) | 869 | [AC_MSG_CHECKING([for libmicrohttpd >= 0.9.32]) |
870 | AC_RUN_IFELSE([AC_LANG_SOURCE([ | 870 | AC_RUN_IFELSE([AC_LANG_SOURCE([ |
871 | #include "$native_srcdir/src/include/platform.h" | 871 | #include "$native_srcdir/src/include/platform.h" |
872 | #include <microhttpd.h> | 872 | #include <microhttpd.h> |
873 | int main () { return MHD_VERSION >= 0x0093002 ? 0 : 1; } | 873 | int main () { return MHD_VERSION >= 0x0093200 ? 0 : 1; } |
874 | ])], [ | 874 | ])], [ |
875 | AC_MSG_RESULT(ok) | 875 | AC_MSG_RESULT(ok) |
876 | lmhd=1],[AC_MSG_RESULT(failed)],lmhd=1)]), | 876 | 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) | |||
2223 | #if BUILD_HTTPS | 2223 | #if BUILD_HTTPS |
2224 | MHD_USE_SSL | | 2224 | MHD_USE_SSL | |
2225 | #endif | 2225 | #endif |
2226 | #ifdef MHD_USE_SUSPEND_RESUME | 2226 | MHD_USE_SUSPEND_RESUME, |
2227 | MHD_USE_SUSPEND_RESUME | | 2227 | plugin->port, |
2228 | #endif | ||
2229 | MHD_NO_FLAG, plugin->port, | ||
2230 | &server_accept_cb, plugin, | 2228 | &server_accept_cb, plugin, |
2231 | &server_access_cb, plugin, | 2229 | &server_access_cb, plugin, |
2232 | MHD_OPTION_SOCK_ADDR, | 2230 | MHD_OPTION_SOCK_ADDR, |