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

[gnunet]

Author: grothoff
Date: 2013-01-26 21:42:29 +0100 (Sat, 26 Jan 2013)
New Revision: 25922

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
   libmicrohttpd/src/include/microhttpd.h
Log:
fixing regression from January 6th

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-01-26 14:27:22 UTC (rev 25921)
+++ libmicrohttpd/ChangeLog     2013-01-26 20:42:29 UTC (rev 25922)
@@ -1,3 +1,7 @@
+Sat Jan 26 21:26:48 CET 2013
+       Fixing regression introduced Jan 6 (test on data_size instead
+       of total_size. -CG
+
 Fri Jan 11 23:21:55 CET 2013
        Also return MHD_YES from MHD_destroy_post_processor if
        we did not get '\r\n' in the upload. -CG
@@ -4,7 +8,7 @@
 
 Sun Jan  6 21:10:13 CET 2013
        Enable use of "MHD_create_response_from_callback" with
-       body size of zeor. -CG
+       body size of zero. -CG
 
 Tue Dec 25 16:16:30 CET 2012
        Releasing libmicrohttpd 0.9.24. -CG

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2013-01-26 14:27:22 UTC (rev 
25921)
+++ libmicrohttpd/src/daemon/connection.c       2013-01-26 20:42:29 UTC (rev 
25922)
@@ -370,7 +370,7 @@
   response = connection->response;
   if (NULL == response->crc)
     return MHD_YES;
-  if (0 == response->data_size)
+  if (0 == response->total_size)
     return MHD_YES; /* 0-byte response is always ready */
   if ( (response->data_start <=
        connection->response_write_position) &&
@@ -479,7 +479,7 @@
   else
     {
       /* buffer not in range, try to fill it */
-      if (0 == response->data_size)
+      if (0 == response->total_size)
        ret = 0; /* response must be empty, don't bother calling crc */
       else
        ret = response->crc (response->crc_cls,
@@ -496,7 +496,7 @@
       return MHD_NO;
     }
   if ( (MHD_CONTENT_READER_END_OF_STREAM == ret) ||
-       (0 == response->data_size) )
+       (0 == response->total_size) )
     {
       /* end of message, signal other side! */
       strcpy (connection->write_buffer, "0\r\n");

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2013-01-26 14:27:22 UTC (rev 
25921)
+++ libmicrohttpd/src/include/microhttpd.h      2013-01-26 20:42:29 UTC (rev 
25922)
@@ -1026,7 +1026,7 @@
  * POST data.
  *
  * @param cls user-specified closure
- * @param kind type of the value
+ * @param kind type of the value, always MHD_POSTDATA_KIND when called from MHD
  * @param key 0-terminated key for the value
  * @param filename name of the uploaded file, NULL if not known
  * @param content_type mime-type of the data, NULL if not known