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

[gnunet]

Author: grothoff
Date: 2015-11-03 23:37:47 +0100 (Tue, 03 Nov 2015)
New Revision: 36638

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/connection.c
Log:
-fix by undoing part of 36568

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-11-02 06:52:35 UTC (rev 36637)
+++ libmicrohttpd/ChangeLog     2015-11-03 22:37:47 UTC (rev 36638)
@@ -1,3 +1,12 @@
+Tue Nov  3 23:24:52 CET 2015
+       Undoing change from Sun Oct 25 15:29:23 CET 2015
+       as the original code was counter-intuitive but
+       correct, and the new code does break pipelining. -CG
+       Releasing libmicrohttpd 0.9.45. -CG
+
+Sat Oct 31 15:52:52 CET 2015
+       Releasing libmicrohttpd 0.9.45. -CG
+
 Tue Oct 27 12:08:02 CET 2015
        Rework deprecation maros: fix errors with old GCC versions,
        improved support for old clang and new GCC. -EG

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2015-11-02 06:52:35 UTC (rev 36637)
+++ libmicrohttpd/configure.ac  2015-11-03 22:37:47 UTC (rev 36638)
@@ -22,13 +22,13 @@
 #
 AC_PREREQ([2.60])
 LT_PREREQ([2.4.0])
-AC_INIT([libmicrohttpd],[0.9.44],address@hidden)
+AC_INIT([libmicrohttpd],[0.9.46],address@hidden)
 AM_INIT_AUTOMAKE([silent-rules] [subdir-objects])
 AC_CONFIG_HEADERS([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=44
+LIB_VERSION_CURRENT=46
 LIB_VERSION_REVISION=0
 LIB_VERSION_AGE=34
 AC_SUBST(LIB_VERSION_CURRENT)

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-11-02 06:52:35 UTC (rev 
36637)
+++ libmicrohttpd/src/include/microhttpd.h      2015-11-03 22:37:47 UTC (rev 
36638)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00094403
+#define MHD_VERSION 0x00094600
 
 /**
  * MHD-internal return code for "YES".
@@ -2145,7 +2145,7 @@
                                        int fd,
                                        off_t offset);
 
-#ifndef _MHD_NO_DEPR_IN_MACRO 
+#ifndef _MHD_NO_DEPR_IN_MACRO
 /* Substitute MHD_create_response_from_fd_at_offset64() instead of 
MHD_create_response_from_fd_at_offset()
    to minimize possible problems with different off_t options */
 #define MHD_create_response_from_fd_at_offset(size,fd,offset) \

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2015-11-02 06:52:35 UTC (rev 
36637)
+++ libmicrohttpd/src/microhttpd/connection.c   2015-11-03 22:37:47 UTC (rev 
36638)
@@ -2555,10 +2555,14 @@
               /* can try to keep-alive */
               connection->version = NULL;
               connection->state = MHD_CONNECTION_INIT;
+              /* read_buffer_size is correct here, as we want to
+                 preserve the entire read buffer allocation, even
+                 if in terms of the data we only care to preserve
+                 up to "read_buffer_offset" */
               connection->read_buffer
                 = MHD_pool_reset (connection->pool,
                                   connection->read_buffer,
-                                  connection->read_buffer_offset);
+                                  connection->read_buffer_size);
             }
          connection->client_aware = MHD_NO;
           connection->client_context = NULL;