[GNUnet-SVN] r15214 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2011-05-12 14:42:46 +0200 (Thu, 12 May 2011)
New Revision: 15214

Modified:
   libmicrohttpd/AUTHORS
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
Log:
bugfix by hzm

Modified: libmicrohttpd/AUTHORS
===================================================================
--- libmicrohttpd/AUTHORS       2011-05-12 12:40:56 UTC (rev 15213)
+++ libmicrohttpd/AUTHORS       2011-05-12 12:42:46 UTC (rev 15214)
@@ -31,6 +31,7 @@
 Andreas Wehrmann <address@hidden>
 Eivind Sarto <address@hidden>
 Thomas Stalder <address@hidden>
+Zhimin Huang <address@hidden>
 
 Documentation contributions also came from:
 Marco Maggi <address@hidden>

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-05-12 12:40:56 UTC (rev 15213)
+++ libmicrohttpd/ChangeLog     2011-05-12 12:42:46 UTC (rev 15214)
@@ -1,3 +1,11 @@
+Thu May 12 14:40:46 CEST 2011
+       Fixed bug where if multiple HTTP request messages are piped in at once,
+       microhttpd would call the handler with the wrong upload_data_size. -HZM
+
+Thu May 12 14:40:08 CEST 2011
+       Documented possible issue with off_t being sometimes
+       32-bit and sometimes 64-bit depending on #includes. -CG
+
 Sun May  8 21:52:47 CEST 2011
        Allow MHD_SIZE_UNKNOWN to be used in conjunction with
        MHD_create_response_from_fd (fixing #1679). -TG

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2011-05-12 12:40:56 UTC (rev 
15213)
+++ libmicrohttpd/src/daemon/connection.c       2011-05-12 12:42:46 UTC (rev 
15214)
@@ -1364,7 +1364,15 @@
       else
         {
           /* no chunked encoding, give all to the client */
-          processed = available;
+          if ( (0 != connection->remaining_upload_size) && 
+              (MHD_SIZE_UNKNOWN != connection->remaining_upload_size) )
+           {
+              processed = connection->remaining_upload_size;
+           }
+          else
+           {
+              processed = available;
+           }
         }
       used = processed;
       connection->client_aware = MHD_YES;