[libmicrohttpd] branch master updated (dcd8ea98 -> fa692560)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from dcd8ea98 mhd_check_func_gettimeofday.m4: added new autoconf macro
     new a5267b29 mhd_shutdown_socket_trigger.m4: fixed preprocessor conditional
     new ea247786 Upgraded TLS: warn if emergency buffer is used
     new fa692560 mhd_find_lib.m4: fixed compatibility with old autoconf

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:
 m4/mhd_find_lib.m4                | 2 +-
 m4/mhd_shutdown_socket_trigger.m4 | 4 ++--
 src/microhttpd/response.c         | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/m4/mhd_find_lib.m4 b/m4/mhd_find_lib.m4
index 8e6a5e9a..c4b5d0a8 100644
--- a/m4/mhd_find_lib.m4
+++ b/m4/mhd_find_lib.m4
@@ -135,7 +135,7 @@ AS_IF([test "x${cv_Var}" != "xno"],
     ]
   )
   m4_n([$5])dnl
-],[m4_n([$6])])dnl AS_VAR_SET_IF cv_Var
+],[$6])dnl AS_VAR_SET_IF cv_Var
 AS_VAR_POPDEF([cv_Var])dnl
 AS_VAR_POPDEF([decl_cv_Var])dnl
 m4_newline([[# Expansion of $0 macro ends here]])
diff --git a/m4/mhd_shutdown_socket_trigger.m4 
b/m4/mhd_shutdown_socket_trigger.m4
index d33c4b18..5f3bbb4f 100644
--- a/m4/mhd_shutdown_socket_trigger.m4
+++ b/m4/mhd_shutdown_socket_trigger.m4
@@ -18,7 +18,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 5
+#serial 6
 
 AC_DEFUN([MHD_CHECK_SOCKET_SHUTDOWN_TRIGGER],[dnl
   AC_PREREQ([2.64])dnl
@@ -121,7 +121,7 @@ AC_DEFUN([_MHD_RUN_CHECK_SOCKET_SHUTDOWN_TRIGGER],[dnl
 
 #include <pthread.h>
 
-   #ifndef SHUT_RD
+#ifndef SHUT_RD
 #  define SHUT_RD 0
 #endif
 #ifndef SHUT_WR
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index 9cab223f..f0ca7825 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -2059,6 +2059,11 @@ MHD_response_execute_upgrade_ (struct MHD_Response 
*response,
          use our 'emergency' buffer of #RESERVE_EBUF_SIZE bytes. */
       avail = RESERVE_EBUF_SIZE;
       buf = urh->e_buf;
+#ifdef HAVE_MESSAGES
+      MHD_DLOG (daemon,
+                _ ("Memory shortage in connection's memory pool. " \
+                   "The \"upgraded\" communication will be inefficient.\n"));
+#endif
     }
     else
     {

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