[libmicrohttpd] branch master updated (c1115185 -> 5bd045bd)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from c1115185 Muted some compiler warnings
     new d98105b9 Fixed compiler warning
     new 5bd045bd Updated W32 resource files

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/mhd_send.c               |  2 +-
 src/microhttpd/microhttpd_dll_res.rc.in |  2 +-
 src/microhttpd/response.c               | 10 +++++++++-
 w32/common/microhttpd_dll_res_vc.rc.in  |  4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 11de6a19..bed850ce 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -858,7 +858,7 @@ MHD_send_hdr_and_body_ (struct MHD_Connection *connection,
          (((size_t) SSIZE_MAX > header_size)) &&
          (0 != body_size) )
     {
-      int ret2;
+      ssize_t ret2;
       /* The header has been sent completely.
        * Try to send the reply body without waiting for
        * the next round. */
diff --git a/src/microhttpd/microhttpd_dll_res.rc.in 
b/src/microhttpd/microhttpd_dll_res.rc.in
index 16a6bba7..fe53e887 100644
--- a/src/microhttpd/microhttpd_dll_res.rc.in
+++ b/src/microhttpd/microhttpd_dll_res.rc.in
@@ -23,7 +23,7 @@ BEGIN
             VALUE "InternalName", "libmicrohttpd\0"
             VALUE "OriginalFilename", "libmicrohttpd-@MHD_W32_DLL_SUFF@.dll\0"
             VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "LegalCopyright",  "Copyright (C) 2007-2017 Christian 
Grothoff and project contributors\0"
+            VALUE "LegalCopyright",  "Copyright (C) 2007-2020 Christian 
Grothoff, Evgeny Grin and project contributors\0"
             VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0";
         END
     END
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index f4dc361c..a77dbe27 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -546,9 +546,17 @@ pipe_reader (void *cls,
   ssize_t n;
 
   (void) pos;
+#ifndef _WIN32
+  if (SSIZE_MAX < max)
+    max = SSIZE_MAX;
+#else  /* _WIN32 */
+  if (UINT_MAX < max)
+    max = UINT_MAX;
+#endif /* _WIN32 */
+
   n = read (response->fd,
             buf,
-            max);
+            (MHD_SCKT_SEND_SIZE_) max);
   if (0 == n)
     return MHD_CONTENT_READER_END_OF_STREAM;
   if (n < 0)
diff --git a/w32/common/microhttpd_dll_res_vc.rc.in 
b/w32/common/microhttpd_dll_res_vc.rc.in
index 97a650d5..64d1cfa9 100644
--- a/w32/common/microhttpd_dll_res_vc.rc.in
+++ b/w32/common/microhttpd_dll_res_vc.rc.in
@@ -23,7 +23,7 @@ BEGIN
             VALUE "ProductName", "GNU libmicrohttpd\0"
             VALUE "ProductVersion", "@PACKAGE_VERSION@\0"
             VALUE "FileVersion", "@PACKAGE_VERSION@\0"
-            VALUE "FileDescription", "GNU libmicrohttpd dll for Windows (VC 
build)\0"
+            VALUE "FileDescription", "GNU libmicrohttpd DLL for Windows (VC 
build)\0"
             VALUE "InternalName", "libmicrohttpd\0"
 #if defined(_DEBUG)
             VALUE "OriginalFilename", "libmicrohttpd-dll_d.dll\0"
@@ -31,7 +31,7 @@ BEGIN
             VALUE "OriginalFilename", "libmicrohttpd-dll.dll\0"
 #endif
             VALUE "CompanyName", "Free Software Foundation\0"
-            VALUE "LegalCopyright",  "Copyright (C) 2007-2017 Christian 
Grothoff and project contributors\0"
+            VALUE "LegalCopyright",  "Copyright (C) 2007-2020 Christian 
Grothoff, Evgeny Grin and project contributors\0"
             VALUE "Comments", "http://www.gnu.org/software/libmicrohttpd/\0";
         END
     END

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