soup-message-io: slight tweak to callback/error handling

Let the callback know whether I/O completed on the message, and move
the server-side "disconnect on I/O error" code from soup-message-io to
soup-server.

1 files changed, 5 insertions, 3 deletions

diff --git a/libsoup/soup-server.c b/libsoup/soup-server.c
index 07d801d1..18aefba5 100644
--- a/libsoup/soup-server.c
+++ b/libsoup/soup-server.c
@@ -870,20 +870,22 @@ soup_client_context_unref (SoupClientContext *client)
 }
 
 static void
-request_finished (SoupMessage *msg, gpointer user_data)
+request_finished (SoupMessage *msg, gboolean io_complete, gpointer user_data)
 {
 	SoupClientContext *client = user_data;
 	SoupServer *server = client->server;
 	SoupSocket *sock = client->sock;
 
 	soup_message_finished (msg);
+
 	g_signal_emit (server,
-		       msg->status_code == SOUP_STATUS_IO_ERROR ?
+		       (!io_complete || msg->status_code == SOUP_STATUS_IO_ERROR) ?
 		       signals[REQUEST_ABORTED] : signals[REQUEST_FINISHED],
 		       0, msg, client);
 
 	soup_client_context_cleanup (client);
-	if (soup_socket_is_connected (sock) && soup_message_is_keepalive (msg)) {
+	if (io_complete && soup_socket_is_connected (sock) &&
+	    soup_message_is_keepalive (msg)) {
 		/* Start a new request */
 		start_request (server, client);
 	} else {