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

[gnunet]

Author: grothoff
Date: 2010-08-31 15:41:22 +0200 (Tue, 31 Aug 2010)
New Revision: 12778

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/connection.c
Log:
call destroy response'


Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2010-08-31 12:16:50 UTC (rev 12777)
+++ libmicrohttpd/ChangeLog     2010-08-31 13:41:22 UTC (rev 12778)
@@ -1,3 +1,11 @@
+Tue Aug 31 15:39:25 CEST 2010
+       Fixed bug with missing call to response cleanup in case of
+       connection handling error (for example, after getting a SIGPIPE). -CG
+
+Tue Aug 24 11:39:25 CEST 2010
+       Fixed bug in handling EAGAIN from GnuTLS (caused
+       needlessly dropped SSL connections). -CG
+
 Sun Aug 22 16:49:13 CEST 2010
        Initial draft for digest authentication. -AA
 

Modified: libmicrohttpd/src/daemon/connection.c
===================================================================
--- libmicrohttpd/src/daemon/connection.c       2010-08-31 12:16:50 UTC (rev 
12777)
+++ libmicrohttpd/src/daemon/connection.c       2010-08-31 13:41:22 UTC (rev 
12778)
@@ -291,6 +291,11 @@
   CLOSE (connection->socket_fd);
   connection->socket_fd = -1;
   connection->state = MHD_CONNECTION_CLOSED;
+  if (connection->response != NULL)
+    {
+      MHD_destroy_response (connection->response);
+      connection->response = NULL;
+    }
   if ( (NULL != connection->daemon->notify_completed) &&
        (MHD_YES == connection->client_aware) )
     connection->daemon->notify_completed (connection->daemon->
@@ -2177,14 +2182,13 @@
           }
 #endif
           MHD_destroy_response (connection->response);
+          connection->response = NULL;
           if (connection->daemon->notify_completed != NULL)
-           {
-             connection->daemon->notify_completed (connection->daemon->
-                                                   notify_completed_cls,
-                                                   connection,
-                                                   &connection->client_context,
-                                                   
MHD_REQUEST_TERMINATED_COMPLETED_OK);
-           }
+           connection->daemon->notify_completed (connection->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,
@@ -2192,7 +2196,6 @@
           connection->client_context = NULL;
           connection->continue_message_write_offset = 0;
           connection->responseCode = 0;
-          connection->response = NULL;
           connection->headers_received = NULL;
           connection->response_write_position = 0;
           connection->have_chunked_upload = MHD_NO;