[libmicrohttpd] branch master updated (17e01403 -> b2b8492d)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 17e01403 mhd_send: made MHD_connection_set_cork_state_() non-static
     new 898453fe mhd_send: fixed copy-paster error in 
99f2df6dea40624ff82b00ebe362e587f722985f
     new b2b8492d memorypool: muted compiler warning and additional assert

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/memorypool.c | 2 ++
 src/microhttpd/mhd_send.c   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
index 27f7f5ab..95112c96 100644
--- a/src/microhttpd/memorypool.c
+++ b/src/microhttpd/memorypool.c
@@ -149,6 +149,7 @@ MHD_pool_create (size_t max)
   size_t alloc_size;
 
   mhd_assert (max > 0);
+  alloc_size = 0;
   pool = malloc (sizeof (struct MemoryPool));
   if (NULL == pool)
     return NULL;
@@ -201,6 +202,7 @@ MHD_pool_create (size_t max)
   pool->pos = 0;
   pool->end = alloc_size;
   pool->size = alloc_size;
+  mhd_assert (0 < alloc_size);
   return pool;
 }
 
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index b347503f..c1696619 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -275,7 +275,7 @@ MHD_connection_set_cork_state_ (struct MHD_Connection 
*connection,
 #else  /* ! TCP_CORK */
                 "TCP_NOPUSH",
 #endif /* ! TCP_CORK */
-                nodelay_state ? _ ("ON") : _ ("OFF"),
+                cork_state ? _ ("ON") : _ ("OFF"),
                 (int) connection->socket_fd,
                 MHD_socket_strerr_ (err_code));
     }
@@ -291,7 +291,7 @@ MHD_connection_set_cork_state_ (struct MHD_Connection 
*connection,
 #else  /* ! TCP_CORK */
               "TCP_NOPUSH",
 #endif /* ! TCP_CORK */
-              nodelay_state ? _ ("ON") : _ ("OFF"),
+              cork_state ? _ ("ON") : _ ("OFF"),
               MHD_socket_strerr_ (err_code));
   }
 #endif /* HAVE_MESSAGES */

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