connection-test, requester-test: test non-persistent connections

Make sure non-persistent connections are closed by the time we finish
processing the request.

2 files changed, 143 insertions, 11 deletions

diff --git a/tests/connection-test.c b/tests/connection-test.c
index 592f9a2c..545bf101 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -430,10 +430,82 @@ do_max_conns_test (void)
 	soup_test_session_abort_unref (session);
 }
 
+GMainLoop *loop;
+
+static void
+np_request_started (SoupSession *session, SoupMessage *msg,
+		    SoupSocket *socket, gpointer user_data)
+{
+	SoupSocket **save_socket = user_data;
+
+	*save_socket = g_object_ref (socket);
+}
+
+static void
+np_request_unqueued (SoupSession *session, SoupMessage *msg,
+		     gpointer user_data)
+{
+	SoupSocket *socket = *(SoupSocket **)user_data;
+
+	if (soup_socket_is_connected (socket)) {
+		debug_printf (1, "    socket is still connected\n");
+		errors++;
+	}
+
+	g_main_loop_quit (loop);
+}
+
 static void
 do_non_persistent_test_for_session (SoupSession *session)
 {
 	SoupMessage *msg;
+	SoupSocket *socket = NULL;
+
+	loop = g_main_loop_new (NULL, FALSE);
+
+	g_signal_connect (session, "request-started",
+			  G_CALLBACK (np_request_started),
+			  &socket);
+	g_signal_connect (session, "request-unqueued",
+			  G_CALLBACK (np_request_unqueued),
+			  &socket);
+
+	msg = soup_message_new_from_uri ("GET", base_uri);
+	soup_message_headers_append (msg->request_headers, "Connection", "close");
+	g_object_ref (msg);
+	soup_session_queue_message (session, msg, NULL, NULL);
+	g_main_loop_run (loop);
+
+	if (msg->status_code != SOUP_STATUS_OK) {
+		debug_printf (1, "      Unexpected response: %d %s\n",
+			      msg->status_code, msg->reason_phrase);
+		errors++;
+	}
+	g_object_unref (msg);
+}
+
+static void
+do_non_persistent_connection_test (void)
+{
+	SoupSession *session;
+
+	debug_printf (1, "\nNon-persistent connections are closed immediately\n");
+
+	debug_printf (1, "  Async session\n");
+	session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL);
+	do_non_persistent_test_for_session (session);
+	soup_test_session_abort_unref (session);
+
+	debug_printf (1, "  Sync session\n");
+	session = soup_test_session_new (SOUP_TYPE_SESSION_SYNC, NULL);
+	do_non_persistent_test_for_session (session);
+	soup_test_session_abort_unref (session);
+}
+
+static void
+do_non_idempotent_test_for_session (SoupSession *session)
+{
+	SoupMessage *msg;
 	SoupSocket *sockets[4] = { NULL, NULL, NULL, NULL };
 	int i;
 
@@ -479,7 +551,7 @@ do_non_persistent_test_for_session (SoupSession *session)
 }
 
 static void
-do_non_persistent_connection_test (void)
+do_non_idempotent_connection_test (void)
 {
 	SoupSession *session;
 
@@ -487,12 +559,12 @@ do_non_persistent_connection_test (void)
 
 	debug_printf (1, "  Async session\n");
 	session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL);
-	do_non_persistent_test_for_session (session);
+	do_non_idempotent_test_for_session (session);
 	soup_test_session_abort_unref (session);
 
 	debug_printf (1, "  Sync session\n");
 	session = soup_test_session_new (SOUP_TYPE_SESSION_SYNC, NULL);
-	do_non_persistent_test_for_session (session);
+	do_non_idempotent_test_for_session (session);
 	soup_test_session_abort_unref (session);
 }
 
@@ -510,6 +582,7 @@ main (int argc, char **argv)
 	do_persistent_connection_timeout_test ();
 	do_max_conns_test ();
 	do_non_persistent_connection_test ();
+	do_non_idempotent_connection_test ();
 
 	soup_uri_free (base_uri);
 	soup_test_server_quit_unref (server);
diff --git a/tests/requester-test.c b/tests/requester-test.c
index 321e0739..0c71d0b2 100644
--- a/tests/requester-test.c
+++ b/tests/requester-test.c
@@ -71,8 +71,12 @@ server_callback (SoupServer *server, SoupMessage *msg,
 					   REDIRECT_HTML_BODY,
 					   strlen (REDIRECT_HTML_BODY));
 		return;
-	} else if (strcmp (path, "/chunked") == 0)
+	} else if (strcmp (path, "/chunked") == 0) {
 		chunked = TRUE;
+	} else if (strcmp (path, "/non-persistent") == 0) {
+		soup_message_headers_append (msg->response_headers,
+					     "Connection", "close");
+	}
 
 	soup_message_set_status (msg, SOUP_STATUS_OK);
 
@@ -90,7 +94,22 @@ server_callback (SoupServer *server, SoupMessage *msg,
 		}
 		soup_message_body_complete (msg->response_body);
 	} else
-		  soup_message_body_append_buffer (msg->response_body, response);
+		soup_message_body_append_buffer (msg->response_body, response);
+}
+
+static void
+stream_closed (GObject *source, GAsyncResult *res, gpointer user_data)
+{
+	GInputStream *stream = G_INPUT_STREAM (source);
+	GError *error = NULL;
+
+	if (!g_input_stream_close_finish (stream, res, &error)) {
+		debug_printf (1, "    close failed: %s", error->message);
+		g_error_free (error);
+		errors++;
+	}
+	g_main_loop_quit (loop);
+	g_object_unref (stream);
 }
 
 static void
@@ -104,13 +123,15 @@ test_read_ready (GObject *source, GAsyncResult *res, gpointer user_data)
 	nread = g_input_stream_read_finish (stream, res, &error);
 	if (nread == -1) {
 		debug_printf (1, "    read_async failed: %s", error->message);
+		g_error_free (error);
 		errors++;
 		g_object_unref (stream);
 		g_main_loop_quit (loop);
 		return;
 	} else if (nread == 0) {
-		g_object_unref (stream);
-		g_main_loop_quit (loop);
+		g_input_stream_close_async (stream,
+					    G_PRIORITY_DEFAULT, NULL,
+					    stream_closed, NULL);
 		return;
 	}
 
@@ -199,17 +220,34 @@ test_sent (GObject *source, GAsyncResult *res, gpointer user_data)
 }
 
 static void
+request_started (SoupSession *session, SoupMessage *msg,
+		 SoupSocket *socket, gpointer user_data)
+{
+	SoupSocket **save_socket = user_data;
+
+	*save_socket = g_object_ref (socket);
+}
+
+static void
 do_one_test (SoupSession *session, SoupURI *uri,
-	     GAsyncReadyCallback callback, SoupBuffer *expected_response)
+	     GAsyncReadyCallback callback, SoupBuffer *expected_response,
+	     gboolean persistent)
 {
 	SoupRequester *requester;
 	SoupRequest *request;
 	GString *body;
+	guint started_id;
+	SoupSocket *socket = NULL;
 
 	requester = SOUP_REQUESTER (soup_session_get_feature (session, SOUP_TYPE_REQUESTER));
 
 	body = g_string_new (NULL);
 	request = soup_requester_request_uri (requester, uri, NULL);
+
+	started_id = g_signal_connect (session, "request-started",
+				       G_CALLBACK (request_started),
+				       &socket);
+
 	soup_request_send_async (request, NULL, callback, body);
 	g_object_unref (request);
 
@@ -217,6 +255,8 @@ do_one_test (SoupSession *session, SoupURI *uri,
 	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 
+	g_signal_handler_disconnect (session, started_id);
+
 	if (body->len != expected_response->length) {
 		debug_printf (1, "    body length mismatch: expected %d, got %d\n",
 			      (int)expected_response->length, (int)body->len);
@@ -227,6 +267,19 @@ do_one_test (SoupSession *session, SoupURI *uri,
 		errors++;
 	}
 
+	if (persistent) {
+		if (!soup_socket_is_connected (socket)) {
+			debug_printf (1, "    socket not still connected!\n");
+			errors++;
+		}
+	} else {
+		if (soup_socket_is_connected (socket)) {
+			debug_printf (1, "    socket still connected!\n");
+			errors++;
+		}
+	}
+	g_object_unref (socket);
+
 	g_string_free (body, TRUE);
 }
 
@@ -243,19 +296,25 @@ do_test_for_thread_and_context (SoupSession *session, const char *base_uri)
 
 	debug_printf (1, "  basic test\n");
 	uri = soup_uri_new (base_uri);
-	do_one_test (session, uri, test_sent, response);
+	do_one_test (session, uri, test_sent, response, TRUE);
 	soup_uri_free (uri);
 
 	debug_printf (1, "  chunked test\n");
 	uri = soup_uri_new (base_uri);
 	soup_uri_set_path (uri, "/chunked");
-	do_one_test (session, uri, test_sent, response);
+	do_one_test (session, uri, test_sent, response, TRUE);
 	soup_uri_free (uri);
 
 	debug_printf (1, "  auth test\n");
 	uri = soup_uri_new (base_uri);
 	soup_uri_set_path (uri, "/auth");
-	do_one_test (session, uri, auth_test_sent, auth_response);
+	do_one_test (session, uri, auth_test_sent, auth_response, TRUE);
+	soup_uri_free (uri);
+
+	debug_printf (1, "  non-persistent test\n");
+	uri = soup_uri_new (base_uri);
+	soup_uri_set_path (uri, "/non-persistent");
+	do_one_test (session, uri, test_sent, response, FALSE);
 	soup_uri_free (uri);
 }