SoupServer: add exciting new APIs, deprecate musty old oneswip/server

FIXME: server-howto

1 files changed, 10 insertions, 11 deletions

diff --git a/tests/ssl-test.c b/tests/ssl-test.c
index 7716f302..a3228fdc 100644
--- a/tests/ssl-test.c
+++ b/tests/ssl-test.c
@@ -3,13 +3,13 @@
 #include "test-utils.h"
 
 static void
-do_properties_test_for_session (SoupSession *session, char *uri)
+do_properties_test_for_session (SoupSession *session, SoupURI *uri)
 {
 	SoupMessage *msg;
 	GTlsCertificate *cert;
 	GTlsCertificateFlags flags;
 
-	msg = soup_message_new ("GET", uri);
+	msg = soup_message_new_from_uri ("GET", uri);
 	soup_session_send_message (session, msg);
 	if (msg->status_code != SOUP_STATUS_OK) {
 		debug_printf (1, "    FAILED: %d %s\n",
@@ -40,7 +40,7 @@ do_properties_test_for_session (SoupSession *session, char *uri)
 }
 
 static void
-do_properties_tests (char *uri)
+do_properties_tests (SoupURI *uri)
 {
 	SoupSession *session;
 
@@ -66,7 +66,7 @@ do_properties_tests (char *uri)
 }
 
 static void
-do_one_strict_test (SoupSession *session, char *uri,
+do_one_strict_test (SoupSession *session, SoupURI *uri,
 		    gboolean strict, gboolean with_ca_list,
 		    guint expected_status)
 {
@@ -84,7 +84,7 @@ do_one_strict_test (SoupSession *session, char *uri,
 	/* Close existing connections with old params */
 	soup_session_abort (session);
 
-	msg = soup_message_new ("GET", uri);
+	msg = soup_message_new_from_uri ("GET", uri);
 	soup_session_send_message (session, msg);
 	if (msg->status_code != expected_status) {
 		debug_printf (1, "      FAILED: %d %s (expected %d %s)\n",
@@ -118,7 +118,7 @@ do_one_strict_test (SoupSession *session, char *uri,
 }
 
 static void
-do_strict_tests (char *uri)
+do_strict_tests (SoupURI *uri)
 {
 	SoupSession *session;
 
@@ -323,21 +323,20 @@ int
 main (int argc, char **argv)
 {
 	SoupServer *server;
-	char *uri;
+	SoupURI *uri;
 
 	test_init (argc, argv, NULL);
 
 	if (tls_available) {
-		server = soup_test_server_new_ssl (TRUE);
+		server = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
 		soup_server_add_handler (server, NULL, server_handler, NULL, NULL);
-		uri = g_strdup_printf ("https://127.0.0.1:%u/",
-				       soup_server_get_port (server));
+		uri = soup_test_server_get_uri (server, "https", "127.0.0.1");
 
 		do_session_property_tests ();
 		do_strict_tests (uri);
 		do_properties_tests (uri);
 
-		g_free (uri);
+		soup_uri_free (uri);
 		soup_test_server_quit_unref (server);
 	}