[GNUnet-SVN] [libmicrohttpd] branch master updated (1fe42d25 -> 228df068)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 1fe42d25 reason_phrase.c: updated copyright
     new 09f0f88e response.c: silent GCC's false warning
     new 228df068 Updated code to use new HTTP status codes

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/connection.c     | 16 ++++++++--------
 src/microhttpd/response.c       |  2 +-
 src/testcurl/test_long_header.c |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 3ce34f65..f192a1bb 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1386,8 +1386,8 @@ MHD_connection_update_event_loop_info (struct 
MHD_Connection *connection)
             {
               transmit_error_response (connection,
                                        (connection->url != NULL)
-                                       ? MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
-                                       : MHD_HTTP_REQUEST_URI_TOO_LONG,
+                                       ? 
MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE
+                                       : MHD_HTTP_URI_TOO_LONG,
                                        REQUEST_TOO_BIG);
               continue;
             }
@@ -1529,8 +1529,8 @@ get_next_header_line (struct MHD_Connection *connection,
        {
          transmit_error_response (connection,
                                   (NULL != connection->url)
-                                  ? MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
-                                  : MHD_HTTP_REQUEST_URI_TOO_LONG,
+                                  ? MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE
+                                  : MHD_HTTP_URI_TOO_LONG,
                                   REQUEST_TOO_BIG);
        }
       if (line_len)
@@ -1580,7 +1580,7 @@ connection_add_header (struct MHD_Connection *connection,
                 _("Not enough memory in pool to allocate header record!\n"));
 #endif
       transmit_error_response (connection,
-                              MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
+                               MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE,
                                REQUEST_TOO_BIG);
       return MHD_NO;
     }
@@ -1622,7 +1622,7 @@ parse_cookie_header (struct MHD_Connection *connection)
                 _("Not enough memory in pool to parse cookies!\n"));
 #endif
       transmit_error_response (connection,
-                               MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
+                               MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE,
                                REQUEST_TOO_BIG);
       return MHD_NO;
     }
@@ -2244,7 +2244,7 @@ process_broken_line (struct MHD_Connection *connection,
       if (NULL == last)
         {
           transmit_error_response (connection,
-                                   MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
+                                   MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE,
                                    REQUEST_TOO_BIG);
           return MHD_NO;
         }
@@ -2260,7 +2260,7 @@ process_broken_line (struct MHD_Connection *connection,
                                        kind)))
     {
       transmit_error_response (connection,
-                               MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
+                               MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE,
                                REQUEST_TOO_BIG);
       return MHD_NO;
     }
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index 8ad6a9d7..498174e6 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -397,7 +397,7 @@ file_reader (void *cls,
     return MHD_CONTENT_READER_END_WITH_ERROR; /* Value of 'response->fd' is 
not valid. */
   else
     {
-      OVERLAPPED f_ol = {0, 0, 0, 0}; /* Initialize to zero. */
+      OVERLAPPED f_ol = {0, 0, {{0, 0}}, 0}; /* Initialize to zero. */
       ULARGE_INTEGER pos_uli;
       DWORD toRead = (max > INT32_MAX) ? INT32_MAX : (DWORD) max;
       DWORD resRead;
diff --git a/src/testcurl/test_long_header.c b/src/testcurl/test_long_header.c
index b2ca1f94..a82464b8 100644
--- a/src/testcurl/test_long_header.c
+++ b/src/testcurl/test_long_header.c
@@ -152,7 +152,7 @@ testLongUrlGet ()
   curl_easy_cleanup (c);
   MHD_stop_daemon (d);
   free (url);
-  if (code != MHD_HTTP_REQUEST_URI_TOO_LONG)
+  if (code != MHD_HTTP_URI_TOO_LONG)
     return 8;
   return 0;
 }
@@ -230,7 +230,7 @@ testLongHeaderGet ()
   curl_easy_cleanup (c);
   MHD_stop_daemon (d);
   free (url);
-  if (code != MHD_HTTP_REQUEST_ENTITY_TOO_LARGE)
+  if (code != MHD_HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE)
     return 128;
   return 0;
 }

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