libmicrohttpd

commit 69b9aa6513f6a0a83e2216f4caea586296ccb905
parent 3233e1386a02935196fef241843780c56ab7a5f5
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu,  2 Jun 2016 09:25:39 +0000

-fix ftbfs

Diffstat:
M
ChangeLog
 | 
3
+++
M
configure.ac
 | 
6
+++---
M
src/include/microhttpd.h
 | 
2
+-
M
src/microhttpd/daemon.c
 | 
6
+++++-

4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Jun  2 09:55:50 CEST 2016
+	Releasing libmicrohttpd 0.9.50. -CG
+
 Wed Jun  1 21:59:34 CEST 2016
 	Do not send "Content-Length" header for 1xx/204/304 status codes. -CG
 
diff --git a/configure.ac b/configure.ac
@@ -22,15 +22,15 @@
 #
 AC_PREREQ([2.60])
 LT_PREREQ([2.4.0])
-AC_INIT([libmicrohttpd],[0.9.49],[libmicrohttpd@gnu.org])
+AC_INIT([libmicrohttpd],[0.9.50],[libmicrohttpd@gnu.org])
 AM_INIT_AUTOMAKE([silent-rules] [subdir-objects])
 AC_CONFIG_HEADERS([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=49
+LIB_VERSION_CURRENT=50
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=37
+LIB_VERSION_AGE=38
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -130,7 +130,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094904
+#define MHD_VERSION 0x00095000
 
 /**
  * MHD-internal return code for "YES".
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -2068,12 +2068,12 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
 #endif /* ! USE_ACCEPT4 */
   if ((MHD_INVALID_SOCKET == s) || (addrlen <= 0))
     {
-#ifdef HAVE_MESSAGES
       const int err = MHD_socket_errno_;
       /* This could be a common occurance with multiple worker threads */
       if ( (EINVAL == err) &&
            (MHD_INVALID_SOCKET == daemon->socket_fd) )
         return MHD_NO; /* can happen during shutdown */
+#ifdef HAVE_MESSAGES
       if ((EAGAIN != err) && (EWOULDBLOCK != err))
         MHD_DLOG (daemon,
 		  "Error accepting connection: %s\n",
@@ -2093,18 +2093,22 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
           /* system/process out of resources */
           if (0 == daemon->connections)
             {
+#ifdef HAVE_MESSAGES
               /* Not setting 'at_limit' flag, as there is no way it
                  would ever be cleared.  Instead trying to produce
                  bit fat ugly warning. */
               MHD_DLOG (daemon,
                         "Hit process or system resource limit at FIRST connection. This is really bad as there is no sane way to proceed. Will try busy waiting for system resources to become magically available.\n");
+#endif
             }
           else
             {
               daemon->at_limit = MHD_YES;
+#ifdef HAVE_MESSAGES
               MHD_DLOG (daemon,
                         "Hit process or system resource limit at %u connections, temporarily suspending accept(). Consider setting a lower MHD_OPTION_CONNECTION_LIMIT.\n",
                         (unsigned int) daemon->connections);
+#endif
             }
         }
       return MHD_NO;