[libmicrohttpd] branch master updated (1777068b -> 2efd5f53)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 1777068b mhd_send: round up readahead size on FreeBSD
     new ccd67603 MHD_add_connection(): do not cleanup if not safe
     new 3d339ebd MHD_add_connection(): warn about suboptimal usage
     new 2efd5f53 test_digestauth_sha256: use unique daemon's port

The 3 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:
 src/microhttpd/daemon.c               | 18 +++++++++++++++++-
 src/testcurl/test_digestauth_sha256.c |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 2eefdef5..5ce5a457 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3209,7 +3209,23 @@ MHD_add_connection (struct MHD_Daemon *daemon,
 {
   bool sk_nonbl;
 
-  MHD_cleanup_connections (daemon);
+  /* NOT thread safe with internal thread. TODO: fix thread safety. */
+  if ((0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) &&
+      (daemon->connection_limit <= daemon->connections))
+    MHD_cleanup_connections (daemon);
+
+#ifdef HAVE_MESSAGES
+  if ((0 != (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) &&
+      (0 == (daemon->options & MHD_USE_ITC)))
+  {
+    MHD_DLOG (daemon,
+              _ ("MHD_add_connection() has called for daemon started without"
+                 " MHD_USE_ITC flag.\nDaemon will not process newly added"
+                 " connection until any activity occurs in already added"
+                 " sockets.\n"));
+  }
+#endif /* HAVE_MESSAGES */
+
   if (! MHD_socket_nonblocking_ (client_socket))
   {
 #ifdef HAVE_MESSAGES
diff --git a/src/testcurl/test_digestauth_sha256.c 
b/src/testcurl/test_digestauth_sha256.c
index 3bf3ce85..4088dc32 100644
--- a/src/testcurl/test_digestauth_sha256.c
+++ b/src/testcurl/test_digestauth_sha256.c
@@ -168,7 +168,7 @@ testDigestAuth ()
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
     port = 0;
   else
-    port = 1165;
+    port = 1167;
 
   cbc.buf = buf;
   cbc.size = 2048;

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