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

[gnunet]

Author: grothoff
Date: 2011-11-13 13:36:59 +0100 (Sun, 13 Nov 2011)
New Revision: 18124

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
Log:
trying to fix issue with 'connectin: close' header duplicated in footer 
reported by Dirk on mailinglist

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-11-13 12:34:54 UTC (rev 18123)
+++ libmicrohttpd/ChangeLog     2011-11-13 12:36:59 UTC (rev 18124)
@@ -1,5 +1,10 @@
+Sun Nov 13 13:34:29 CET 2011
+       Trying to fix accidental addition of a "Connection: close" footer
+       under certain (rare) circumstances. -CG
+
 Fri Nov  4 10:03:00 CET 2011
-       Small updates to the tutorial. -CG
+       Small updates to the tutorial. 
+       Releasing 0.9.16. -CG
 
 Thu Nov  3 10:14:59 CET 2011
        shutdown(RDWR) fails on OS X after shutdown(RD), so only use

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2011-11-13 12:34:54 UTC (rev 
18123)
+++ libmicrohttpd/src/daemon/connection.c       2011-11-13 12:36:59 UTC (rev 
18124)
@@ -671,7 +671,8 @@
       kind = MHD_FOOTER_KIND;
       off = 0;
     }
-  must_add_close = ( (connection->read_closed == MHD_YES) &&
+  must_add_close = ( (connection->state == MHD_CONNECTION_FOOTERS_RECEIVED) &&
+                    (connection->read_closed == MHD_YES) &&
                     (0 == strcasecmp (connection->version,
                                       MHD_HTTP_VERSION_1_1)) &&
                     (NULL == MHD_get_response_header (connection->response,