[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37234 - in libmicrohttpd: . src/include src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37234 - in libmicrohttpd: . src/include src/microhttpd |
Date: |
Thu, 2 Jun 2016 11:25:40 +0200 |
Author: grothoff
Date: 2016-06-02 11:25:39 +0200 (Thu, 02 Jun 2016)
New Revision: 37234
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/configure.ac
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/microhttpd/daemon.c
Log:
-fix ftbfs
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2016-06-02 07:46:10 UTC (rev 37233)
+++ libmicrohttpd/ChangeLog 2016-06-02 09:25:39 UTC (rev 37234)
@@ -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
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2016-06-02 07:46:10 UTC (rev 37233)
+++ libmicrohttpd/configure.ac 2016-06-02 09:25:39 UTC (rev 37234)
@@ -22,15 +22,15 @@
#
AC_PREREQ([2.60])
LT_PREREQ([2.4.0])
-AC_INIT([libmicrohttpd],[0.9.49],address@hidden)
+AC_INIT([libmicrohttpd],[0.9.50],address@hidden)
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)
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2016-06-02 07:46:10 UTC (rev
37233)
+++ libmicrohttpd/src/include/microhttpd.h 2016-06-02 09:25:39 UTC (rev
37234)
@@ -130,7 +130,7 @@
* Current version of the library.
* 0x01093001 = 1.9.30-1.
*/
-#define MHD_VERSION 0x00094904
+#define MHD_VERSION 0x00095000
/**
* MHD-internal return code for "YES".
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2016-06-02 07:46:10 UTC (rev
37233)
+++ libmicrohttpd/src/microhttpd/daemon.c 2016-06-02 09:25:39 UTC (rev
37234)
@@ -2068,12 +2068,12 @@
#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 @@
/* 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37234 - in libmicrohttpd: . src/include src/microhttpd,
gnunet <=