[libmicrohttpd] branch master updated (4f1e02a9 -> 055979f8)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 4f1e02a9 Fixed doxy for MHD_suspend_connection()
     new 9474ec08 Added _MHD_HEAVY_TESTS to MHD_config.h
     new 055979f8 test_client_put_stop: use correct 'sleep' amount on W32

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                          | 5 ++++-
 src/microhttpd/test_client_put_stop.c | 3 ++-
 src/testzzuf/Makefile.am              | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index ca403875..9ca14b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1076,7 +1076,10 @@ AC_ARG_ENABLE([[heavy-tests]],
   [activity is recommended to enable.])], [],
     [enable_heavy_tests=no])
 AS_VAR_IF([enable_heavy_tests], ["yes"],
-  [HEAVY_TESTS_NOTPARALLEL='.NOTPARALLEL:'],
+  [
+    HEAVY_TESTS_NOTPARALLEL='.NOTPARALLEL:'
+    AC_DEFINE([_MHD_HEAVY_TESTS], [1], [Define to 1 to enable "heavy" test 
paths.])
+  ],
   [
     enable_heavy_tests=no
     HEAVY_TESTS_NOTPARALLEL=" "
diff --git a/src/microhttpd/test_client_put_stop.c 
b/src/microhttpd/test_client_put_stop.c
index bb49da07..d5ce701f 100644
--- a/src/microhttpd/test_client_put_stop.c
+++ b/src/microhttpd/test_client_put_stop.c
@@ -835,6 +835,7 @@ _MHD_dumbClient_perform (struct _MHD_dumbClient *clnt)
         mhd_assert ((0 != rs.fd_count) || (0 != ws.fd_count) || \
                     (0 != es.fd_count));
         externalErrorExitDesc ("Unexpected select() error");
+        Sleep (tv.tv_sec * 1000 + tv.tv_usec / 1000);
 #endif /* ! MHD_POSIX_SOCKETS */
         continue;
       }
@@ -1277,7 +1278,7 @@ performQueryExternal (struct MHD_Daemon *d, struct 
_MHD_dumbClient *clnt)
       if ((WSAEINVAL != WSAGetLastError ()) ||
           (0 != rs.fd_count) || (0 != ws.fd_count) || (0 != es.fd_count) )
         externalErrorExitDesc ("Unexpected select() error");
-      Sleep (1);
+      Sleep (tv.tv_sec * 1000 + tv.tv_usec / 1000);
 #endif
       continue;
     }
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index b26d0c84..c657f34e 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -8,10 +8,6 @@ endif
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/include \
   $(LIBCURL_CPPFLAGS)
-  
-if HEAVY_TESTS
-AM_CPPFLAGS += -D_MHD_HEAVY_TESTS=1
-endif  
 
 EXTRA_DIST = README socat.c
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.