[libmicrohttpd] branch master updated (129e28d3 -> b1fff186)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 129e28d3 mhd_panic: minor macro improvement
     new 5d28b72d W32 projects: updated custom MHD_config.h
     new b1fff186 I'm trying to use libmicrohttpd on a platform where fcntl(fd, 
O_NONBLOCK) doesn't work for sockets. This shouldn't be a problem, as far as I 
understand, except in epoll mode, which I'm not using, because epoll() isn't 
available either.

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:
 src/microhttpd/daemon.c | 2 +-
 w32/common/MHD_config.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 64524b1b..8308e6ef 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2985,7 +2985,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
     return MHD_NO;
   }
 
-  if ( (0 == (daemon->options & MHD_USE_EPOLL)) &&
+  if ( (0 != (daemon->options & MHD_USE_EPOLL)) &&
        (! non_blck) )
   {
 #ifdef HAVE_MESSAGES
diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index 2c51237a..7a658d7b 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -43,9 +43,15 @@
 /* The size of `tv_sec' member of `struct timeval', as computed by sizeof */
 #define SIZEOF_STRUCT_TIMEVAL_TV_SEC 4
 
+/* The size of `int64_t', as computed by sizeof. */
+#define SIZEOF_INT64_T 8
+
 /* The size of `uint64_t', as computed by sizeof. */
 #define SIZEOF_UINT64_T 8
 
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
 /* The size of `unsigned int', as computed by sizeof. */
 #define SIZEOF_UNSIGNED_INT 4
 
@@ -77,6 +83,9 @@
 /* Enable HTTP Upgrade support. */
 #define UPGRADE_SUPPORT 1
 
+/* Enable HTTP cookie parsing support. */
+#define COOKIE_SUPPORT 1
+
 /* *** OS features *** */
 
 /* Provides IPv6 headers */

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