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

[gnunet]

Author: grothoff
Date: 2014-05-17 06:47:33 +0200 (Sat, 17 May 2014)
New Revision: 33312

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/microhttpd/connection.c
Log:
never notify twice

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2014-05-16 17:23:47 UTC (rev 33311)
+++ libmicrohttpd/ChangeLog     2014-05-17 04:47:33 UTC (rev 33312)
@@ -1,3 +1,7 @@
+Sat May 17 06:47:00 CEST 2014
+       Fix notifying client about completed request twice
+       under certain circumstances. -CG
+
 Tue May 13 18:24:37 CEST 2014
        Fix accidental transmission of footer termination '\r\n'
        for responses with zero byte payload and non-chunked

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2014-05-16 17:23:47 UTC (rev 
33311)
+++ libmicrohttpd/src/microhttpd/connection.c   2014-05-17 04:47:33 UTC (rev 
33312)
@@ -2535,11 +2535,15 @@
                                     MHD_HTTP_HEADER_CONNECTION);
           MHD_destroy_response (connection->response);
           connection->response = NULL;
-          if (NULL != daemon->notify_completed)
+          if ( (NULL != daemon->notify_completed) &&
+               (MHD_YES == connection->client_aware) )
+          {
            daemon->notify_completed (daemon->notify_completed_cls,
                                      connection,
                                      &connection->client_context,
                                                  
MHD_REQUEST_TERMINATED_COMPLETED_OK);
+            connection->client_aware = MHD_NO;
+          }
           end =
             MHD_lookup_connection_value (connection, MHD_HEADER_KIND,
                                          MHD_HTTP_HEADER_CONNECTION);