diff options
Diffstat (limited to 'tests/proxy-test.c')
| -rw-r--r-- | tests/proxy-test.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tests/proxy-test.c b/tests/proxy-test.c index 1d68aa05..c9be7894 100644 --- a/tests/proxy-test.c +++ b/tests/proxy-test.c @@ -61,8 +61,8 @@ authenticate (SoupSession *session, SoupMessage *msg, } static void -set_close_on_connect (SoupSession *session, SoupMessage *msg, - SoupSocket *sock, gpointer user_data) +set_close_on_connect (SoupMessage *msg, + gpointer user_data) { /* This is used to test that we can handle the server closing * the connection when returning a 407 in response to a @@ -74,7 +74,6 @@ set_close_on_connect (SoupSession *session, SoupMessage *msg, } } - static void test_url (const char *url, int proxy, guint expected, gboolean sync, gboolean close) @@ -101,11 +100,6 @@ test_url (const char *url, int proxy, guint expected, NULL); g_signal_connect (session, "authenticate", G_CALLBACK (authenticate), NULL); - if (close) { - /* FIXME g_test_bug ("611663") */ - g_signal_connect (session, "request-started", - G_CALLBACK (set_close_on_connect), NULL); - } msg = soup_message_new (SOUP_METHOD_GET, url); if (!msg) { @@ -113,6 +107,12 @@ test_url (const char *url, int proxy, guint expected, exit (1); } + if (close) { + /* FIXME g_test_bug ("611663") */ + g_signal_connect (msg, "starting", + G_CALLBACK (set_close_on_connect), NULL); + } + soup_session_send_message (session, msg); debug_printf (1, " %d %s\n", msg->status_code, msg->reason_phrase); @@ -153,15 +153,16 @@ test_url_new_api (const char *url, int proxy, guint expected, g_signal_connect (session, "authenticate", G_CALLBACK (authenticate), NULL); + + request = soup_session_request (session, url, NULL); + msg = soup_request_http_get_message (SOUP_REQUEST_HTTP (request)); + if (close) { /* FIXME g_test_bug ("611663") */ - g_signal_connect (session, "request-started", + g_signal_connect (msg, "starting", G_CALLBACK (set_close_on_connect), NULL); } - request = soup_session_request (session, url, NULL); - msg = soup_request_http_get_message (SOUP_REQUEST_HTTP (request)); - stream = soup_test_request_send (request, NULL, 0, &error); g_assert_no_error (error); g_clear_error (&error); |