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

[gnunet]

Author: grothoff
Date: 2011-09-19 14:06:46 +0200 (Mon, 19 Sep 2011)
New Revision: 16954

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
Log:
trying to fix Regis's problem

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-09-19 11:28:23 UTC (rev 16953)
+++ libmicrohttpd/ChangeLog     2011-09-19 12:06:46 UTC (rev 16954)
@@ -1,3 +1,6 @@
+Mon Sep 19 14:06:30 CEST 2011
+       Fixing problem introduced with prompt response cleanup code. -CG
+
 Wed Sep 14 13:43:26 CEST 2011
        Fixing minor memory leak if daemon with HTTPS support failed to
        initialize (#1766). -CG

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2011-09-19 11:28:23 UTC (rev 
16953)
+++ libmicrohttpd/src/daemon/connection.c       2011-09-19 12:06:46 UTC (rev 
16954)
@@ -311,11 +311,6 @@
                              &connection->client_context,
                              termination_code);
   connection->client_aware = MHD_NO;
-  if (connection->response != NULL)
-    {
-      MHD_destroy_response (connection->response);
-      connection->response = NULL;
-    }
 }
 
 
@@ -2291,6 +2286,11 @@
             }
           continue;
         case MHD_CONNECTION_CLOSED:
+         if (connection->response != NULL)
+           {
+             MHD_destroy_response (connection->response);
+             connection->response = NULL;
+           }
          daemon = connection->daemon;
          if (0 != pthread_mutex_lock(&daemon->cleanup_connection_mutex))
            {