[libmicrohttpd] branch master updated (b5315c24 -> a061caa2)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from b5315c24 Fixed builds with --disable-messages
     new f53db289 Muted compiler warnings
     new a061caa2 Fixed builds with --disable-https or --disable-httpupgrade

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:
 doc/examples/tlsauthentication.c          | 2 +-
 src/examples/websocket_threaded_example.c | 6 +++---
 src/microhttpd/daemon.c                   | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/examples/tlsauthentication.c b/doc/examples/tlsauthentication.c
index ca8187bc..5b2dec1d 100644
--- a/doc/examples/tlsauthentication.c
+++ b/doc/examples/tlsauthentication.c
@@ -54,7 +54,7 @@ string_to_base64 (const char *message)
   }
 
   if (length % 3)
-    strncat (tmp, "===", 3 - length % 3);
+    strncat (tmp, "==", 3 - length % 3);
 
   return tmp;
 }
diff --git a/src/examples/websocket_threaded_example.c 
b/src/examples/websocket_threaded_example.c
index 1f4db5b8..4c767f0a 100644
--- a/src/examples/websocket_threaded_example.c
+++ b/src/examples/websocket_threaded_example.c
@@ -482,7 +482,7 @@ ws_get_accept_value (const char *key, char **val)
   char *str;
   ssize_t len;
 
-  if (NULL == key)
+  if ( (NULL == key) || (WS_KEY_LEN != strlen (key)))
   {
     return MHD_NO;
   }
@@ -535,7 +535,7 @@ send_all (MHD_socket sock, const unsigned char *buf, size_t 
len)
 
   for (off = 0; off < len; off += ret)
   {
-    ret = send (sock, (const void*)&buf[off], len - off, 0);
+    ret = send (sock, (const void*) &buf[off], len - off, 0);
     if (0 > ret)
     {
       if (EAGAIN == errno)
@@ -711,7 +711,7 @@ run_usock (void *cls)
     }
     if (type == WS_OPCODE_TEXT_FRAME)
     {
-      size = sprintf (client, "User#%d: ", (int)ws->sock);
+      size = sprintf (client, "User#%d: ", (int) ws->sock);
       size += got;
       text = malloc (size);
       if (NULL != text)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 40ec8fc9..6b0aec81 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -7099,6 +7099,7 @@ close_all_connections (struct MHD_Daemon *daemon)
   struct MHD_UpgradeResponseHandle *urh;
   struct MHD_UpgradeResponseHandle *urhn;
   const bool used_tls = (0 != (daemon->options & MHD_USE_TLS));
+#endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
 
   mhd_assert ( (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD)) || \
                (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \
@@ -7119,6 +7120,7 @@ close_all_connections (struct MHD_Daemon *daemon)
                 pos);
     new_connection_close_ (daemon, pos);
   }
+#if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT)
   /* give upgraded HTTPS connections a chance to finish */
   /* 'daemon->urh_head' is not used in thread-per-connection mode. */
   for (urh = daemon->urh_tail; NULL != urh; urh = urhn)

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