[GNUnet-SVN] r27035 - in libmicrohttpd: . src/microhttpd

[gnunet]

Author: grothoff
Date: 2013-05-06 12:49:23 +0200 (Mon, 06 May 2013)
New Revision: 27035

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/connection.c
Log:
-fixing #2859

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-05-05 19:44:54 UTC (rev 27034)
+++ libmicrohttpd/ChangeLog     2013-05-06 10:49:23 UTC (rev 27035)
@@ -1,3 +1,6 @@
+Mon May  6 12:49:01 CEST 2013
+       Fixing #2859. -CG
+
 Sun May  5 21:44:08 CEST 2013
        Merged libmicrospdy code with libmicrohttpd build system
        (no major changes to libmicrospdy itself yet). -CG

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2013-05-05 19:44:54 UTC (rev 
27034)
+++ libmicrohttpd/src/microhttpd/connection.c   2013-05-06 10:49:23 UTC (rev 
27035)
@@ -2034,6 +2034,12 @@
                 pthread_mutex_unlock (&response->mutex);
               break;
             }
+         if (response->data_size == connection->response_write_position - 
response->data_start)
+           {
+             /* nothing to transmit, move on */
+             connection->state = MHD_CONNECTION_BODY_SENT;
+             return MHD_YES;
+           }
          ret = connection->send_cls (connection,
                                      &response->data
                                      [connection->response_write_position