[GNUnet-SVN] r33921 - in gnunet: . src/transport

[gnunet]

Author: amatus
Date: 2014-07-03 22:11:03 +0200 (Thu, 03 Jul 2014)
New Revision: 33921

Modified:
   gnunet/configure.ac
   gnunet/src/transport/plugin_transport_http_server.c
Log:
Require libmicrohttpd >= 0.9.32

We are using suspend/resume features for plugin_transport_http_server
which were added in 0.9.32.


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2014-07-03 18:52:53 UTC (rev 33920)
+++ gnunet/configure.ac 2014-07-03 20:11:03 UTC (rev 33921)
@@ -829,11 +829,11 @@
         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_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_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)]),

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2014-07-03 18:52:53 UTC 
(rev 33920)
+++ gnunet/src/transport/plugin_transport_http_server.c 2014-07-03 20:11:03 UTC 
(rev 33921)
@@ -2223,10 +2223,8 @@
 #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,