[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36014 - in libmicrohttpd: . src/include src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36014 - in libmicrohttpd: . src/include src/microhttpd |
Date: |
Sat, 27 Jun 2015 22:19:25 +0200 |
Author: grothoff
Date: 2015-06-27 22:19:25 +0200 (Sat, 27 Jun 2015)
New Revision: 36014
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/src/include/microhttpd.h
libmicrohttpd/src/microhttpd/daemon.c
Log:
fix late counter-decrement issue reported by MD on the mailinglist
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2015-06-27 19:50:10 UTC (rev 36013)
+++ libmicrohttpd/ChangeLog 2015-06-27 20:19:25 UTC (rev 36014)
@@ -1,3 +1,12 @@
+Sat Jun 27 22:16:27 CEST 2015
+ Make sure to decrement connection counter before
+ calling connection notifier so that
+ MHD_DAEMON_INFO_CURRENT_CONNECTIONS does not
+ present stale information (relevant if this is
+ used for termination detection of a daemon
+ stopped via MHD_quiesce_daemon()). Thanks to
+ Markus Doppelbauer for reporting. -CG
+
Fri Jun 26 23:17:20 CEST 2015
Fix (automatic) handling of HEAD requests with
MHD_create_response_from_callback() and HTTP/1.1
Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h 2015-06-27 19:50:10 UTC (rev
36013)
+++ libmicrohttpd/src/include/microhttpd.h 2015-06-27 20:19:25 UTC (rev
36014)
@@ -130,7 +130,7 @@
* Current version of the library.
* 0x01093001 = 1.9.30-1.
*/
-#define MHD_VERSION 0x00094205
+#define MHD_VERSION 0x00094206
/**
* MHD-internal return code for "YES".
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2015-06-27 19:50:10 UTC (rev
36013)
+++ libmicrohttpd/src/microhttpd/daemon.c 2015-06-27 20:19:25 UTC (rev
36014)
@@ -1019,7 +1019,7 @@
&con->socket_context,
MHD_CONNECTION_NOTIFY_CLOSED);
- return (MHD_THRD_RTRN_TYPE_)0;
+ return (MHD_THRD_RTRN_TYPE_) 0;
}
@@ -2039,6 +2039,7 @@
if (NULL != pos->tls_session)
gnutls_deinit (pos->tls_session);
#endif
+ daemon->connections--;
if (NULL != daemon->notify_connection)
daemon->notify_connection (daemon->notify_connection_cls,
pos,
@@ -2087,7 +2088,6 @@
if (NULL != pos->addr)
free (pos->addr);
free (pos);
- daemon->connections--;
}
if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
(MHD_YES != MHD_mutex_unlock_ (&daemon->cleanup_connection_mutex)) )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36014 - in libmicrohttpd: . src/include src/microhttpd,
gnunet <=