libmicrohttpd

commit 67c412a99c2e974092b69260f2c6525ced3fbd02
parent a77fe211313dcf29e2b42736a6532a298183169f
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 31 Aug 2010 13:41:22 +0000

call destroy response'


Diffstat:
M
ChangeLog
 | 
8
++++++++
M
src/daemon/connection.c
 | 
19
+++++++++++--------

2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
 
diff --git a/src/daemon/connection.c b/src/daemon/connection.c
@@ -291,6 +291,11 @@ MHD_connection_close (struct MHD_Connection *connection,
   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 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
           }
 #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 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
           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;