[GNUnet-SVN] [libmicrohttpd] branch master updated (b4216c60 -> 98a4f3f4)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from b4216c60 Check response existence on upgrade
     new 2849ef7f Fixed and formatted b4216c60fdb5b48f6cfec416301fc63a1167e6cd
     new ae6ab22d transmit_error_response(): allow to transmit error even if 
response was set.
     new d9df0418 connection.c: more cleanup after completed of serving request.
     new 98a4f3f4 Used local "mhd_limits.h" for better compatibility

The 4 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/basicauth.c  |  2 +-
 src/microhttpd/connection.c | 16 +++++++++++++---
 src/microhttpd/digestauth.c |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/microhttpd/basicauth.c b/src/microhttpd/basicauth.c
index b2c4180d..4cb671e4 100644
--- a/src/microhttpd/basicauth.c
+++ b/src/microhttpd/basicauth.c
@@ -23,7 +23,7 @@
  * @author Matthieu Speder
  */
 #include "platform.h"
-#include <limits.h>
+#include "mhd_limits.h"
 #include "internal.h"
 #include "base64.h"
 #include "mhd_compat.h"
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 9dba3431..d4f25242 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -26,7 +26,7 @@
  */
 
 #include "internal.h"
-#include <limits.h>
+#include "mhd_limits.h"
 #include "connection.h"
 #include "memorypool.h"
 #include "response.h"
@@ -882,7 +882,8 @@ keepalive_possible (struct MHD_Connection *connection)
 #ifdef UPGRADE_SUPPORT
     if ( (MHD_str_equal_caseless_ (end,
                                    "upgrade")) &&
-         (NULL == connection->response || NULL == 
connection->resp�onse->upgrade_handler) )
+         ( (NULL == connection->response) ||
+           (NULL == connection->response->upgrade_handler) ) )
       return MHD_NO;
 #endif /* UPGRADE_SUPPORT */
 
@@ -1339,7 +1340,11 @@ transmit_error_response (struct MHD_Connection 
*connection,
             status_code,
             message);
 #endif
-  EXTRA_CHECK (NULL == connection->response);
+  if (NULL != connection->response)
+    {
+      MHD_destroy_response (connection->response);
+      connection->response = NULL;
+    }
   response = MHD_create_response_from_buffer (strlen (message),
                                              (void *) message,
                                              MHD_RESPMEM_PERSISTENT);
@@ -3229,6 +3234,9 @@ MHD_connection_handle_idle (struct MHD_Connection 
*connection)
                 socket_start_normal_buffering (connection);
               connection->version = NULL;
               connection->state = MHD_CONNECTION_INIT;
+              connection->last = NULL;
+              connection->colon = NULL;
+              connection->header_size = 0;
               /* Reset the read buffer to the starting size,
                  preserving the bytes we have already read. */
               connection->read_buffer
@@ -3247,6 +3255,8 @@ MHD_connection_handle_idle (struct MHD_Connection 
*connection)
          connection->headers_received_tail = NULL;
           connection->response_write_position = 0;
           connection->have_chunked_upload = false;
+          connection->current_chunk_size = 0;
+          connection->current_chunk_offset = 0;
           connection->method = NULL;
           connection->url = NULL;
           connection->write_buffer = NULL;
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 7ade4542..f1f55dfa 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -23,7 +23,7 @@
  * @author Matthieu Speder
  */
 #include "platform.h"
-#include <limits.h>
+#include "mhd_limits.h"
 #include "internal.h"
 #include "md5.h"
 #include "mhd_mono_clock.h"

-- 
To stop receiving notification emails like this one, please contact
address@hidden