all: Port to libsoup3 / GUPnP-1.6

34 files changed, 283 insertions, 359 deletions

diff --git a/src/librygel-core/rygel-root-device.vala b/src/librygel-core/rygel-root-device.vala
index b14bf8c0..975967f7 100644
--- a/src/librygel-core/rygel-root-device.vala
+++ b/src/librygel-core/rygel-root-device.vala
@@ -47,7 +47,7 @@ public class Rygel.RootDevice: GUPnP.RootDevice, GLib.Initable {
                        string        description_dir) throws Error {
         Object (context : context,
                 resource_factory : plugin,
-                description_doc : description_doc,
+                document : description_doc,
                 description_path: description_path,
                 description_dir: description_dir);
         init (null);
diff --git a/src/librygel-renderer/rygel-av-transport.vala b/src/librygel-renderer/rygel-av-transport.vala
index f9fe11ad..0c6b0ab0 100644
--- a/src/librygel-renderer/rygel-av-transport.vala
+++ b/src/librygel-renderer/rygel-av-transport.vala
@@ -141,8 +141,8 @@ internal class Rygel.AVTransport : Service {
                                         (BuildConfig.PACKAGE_VERSION);
         }
 
-        this.session = new Session.with_options (Soup.SESSION_USER_AGENT,
-                                                 this.player.user_agent);
+        this.session = new Session ();
+        this.session.set_user_agent (this.player.user_agent);
 
         this.protocol_info = plugin.get_protocol_info ();
     }
@@ -224,7 +224,7 @@ internal class Rygel.AVTransport : Service {
                         typeof (string),
                         out _metadata);
 
-        this.handle_new_transport_uri (action, _uri, _metadata);
+        this.handle_new_transport_uri.begin (action, _uri, _metadata);
     }
 
     private void set_next_av_transport_uri_cb (Service       service,
@@ -242,7 +242,7 @@ internal class Rygel.AVTransport : Service {
                         typeof (string),
                         out _metadata);
 
-        this.handle_new_transport_uri (action, _uri, _metadata);
+        this.handle_new_transport_uri.begin (action, _uri, _metadata);
     }
 
     private bool is_valid_mime_type (string? mime) {
@@ -720,13 +720,13 @@ internal class Rygel.AVTransport : Service {
         this.changelog.log ("CurrentPlayMode", this.controller.play_mode);
     }
 
-    private MediaCollection? parse_m3u_playlist (uint8[]? data) throws Error {
+    private MediaCollection? parse_m3u_playlist (Bytes? data) throws Error {
         if (data == null) {
             return null;
         }
 
         var collection = new MediaCollection ();
-        var m_stream = new MemoryInputStream.from_data (data, null);
+        var m_stream = new MemoryInputStream.from_bytes (data);
         var stream = new DataInputStream (m_stream);
 
         debug ("Trying to parse m3u playlist");
@@ -765,10 +765,15 @@ internal class Rygel.AVTransport : Service {
                                         string mime,
                                         string features) {
         var message = new Message ("GET", uri);
-        this.session.queue_message (message, () => {
-            handle_playlist.callback ();
-        });
-        yield;
+        Bytes? body = null;
+
+        try {
+            body = yield this.session.send_and_read_async (message, Priority.DEFAULT, null);
+        } catch (Error error) {
+            action.return_error (716, _("Resource not found"));
+
+            return;
+        }
 
         if (message.status_code != 200) {
             action.return_error (716, _("Resource not found"));
@@ -782,7 +787,7 @@ internal class Rygel.AVTransport : Service {
         if (content_type.has_suffix ("mpegurl")) {
             debug ("Trying to parse m3u playlist");
             try {
-                collection = parse_m3u_playlist (message.response_body.data);
+                collection = parse_m3u_playlist (body);
             } catch (Error error) {
                 warning (_("Problem parsing playlist: %s"), error.message);
                 // FIXME: Return a more sensible error here.
@@ -791,7 +796,7 @@ internal class Rygel.AVTransport : Service {
                 return;
             }
         } else {
-            unowned string xml_string = (string) message.response_body.data;
+            unowned string xml_string = (string) body.get_data();
             collection = new MediaCollection.from_string (xml_string);
             if (collection.get_items ().length () == 0) {
                 // FIXME: Return a more sensible error here.
@@ -822,132 +827,77 @@ internal class Rygel.AVTransport : Service {
                 mime.has_suffix ("mpegurl");
     }
 
-    bool head_faked;
-
-    // HACK ALERT: This work around vala's feature of capturing 'this' pointer
-    // for all lambdas introduced in a class instance, even if 'this' is never
-    // used. Captured 'this' extends lifetime of an AVTransport instance beyond
-    // time expected by GUPnP. Due to GUPnP not using weak pointers at some
-    // places (e.g. xmlNode property of GUPnPServiceInfo), a crash happens when
-    // AVTransport is freed.
-    private static void setup_check_resource_callback (AVTransport instance, Soup.Message message) {
-        var weakme = WeakRef (instance);
-        var weakmsg = WeakRef (message);
-        message.got_headers.connect( () => {
-                Rygel.AVTransport? me = (Rygel.AVTransport?)weakme.get();
-                Soup.Message? msg = (Soup.Message?)weakmsg.get();
-                if (me == null || msg == null)
-                    return;
-                me.head_faked = true;
-                me.session.cancel_message (msg, msg.status_code);
-            });
-    }
-
-    private void check_resource (Soup.Message msg,
-                                 string       _uri,
-                                 string       _metadata,
-                                 ServiceAction action) {
-        // Error codes gotten by experience from several web services or web
-        // radio stations that don't support HEAD but return a variety of
-        // errors.
-        if ((msg.status_code == Status.MALFORMED ||
-             msg.status_code == Status.BAD_REQUEST ||
-             msg.status_code == Status.METHOD_NOT_ALLOWED ||
-             msg.status_code == Status.NOT_IMPLEMENTED) &&
-            msg.method == "HEAD") {
-            debug ("Peer does not support HEAD, trying GET");
-            msg.method = "GET";
-
-            // Fake HEAD request by cancelling the message after the headers
-            // were received, then restart the message
-            setup_check_resource_callback (this, msg);
-
-            this.session.queue_message (msg, null);
+    private async void handle_new_transport_uri (ServiceAction action,
+                                           string        uri,
+                                           string        metadata) {
+
+        if (!uri.has_prefix ("http://") && !uri.has_prefix ("https://")) {
+            this.set_single_play_uri (action, uri, metadata, null, null);
 
             return;
         }
 
-        if (msg.status_code != Status.OK && !this.head_faked) {
-            // TRANSLATORS: first %s is a URI, the second an explanaition of
-            // the error
-            warning (_("Failed to access resource at %s: %s"),
-                     _uri,
-                     msg.reason_phrase);
+        var new_uri = this.context.rewrite_uri (uri);
+        var message = new Message ("HEAD", new_uri);
+        message.request_headers.append ("getContentFeatures.dlna.org",
+                                        "1");
+        message.request_headers.append ("Connection", "close");
+
+        try {
+            yield this.session.send_async (message, Priority.DEFAULT, null);
+            if (message.status_code == Status.BAD_REQUEST ||
+                message.status_code == Status.METHOD_NOT_ALLOWED ||
+                message.status_code == Status.NOT_IMPLEMENTED) {
+                debug ("Peer does not support HEAD, trying GET");
+                message.method = "GET";
+                yield this.session.send_async (message, Priority.DEFAULT, null);
+            }
 
-            action.return_error (716, _("Resource not found"));
+            if (message.status_code != Status.OK) {
+                // TRANSLATORS: first %s is a URI, the second an explanaition of
+                // the error
+                warning (_("Failed to access resource at %s: %s"),
+                         uri,
+                         message.reason_phrase);
 
-            return;
-        }
+                action.return_error (716, _("Resource not found"));
 
-        var mime = msg.response_headers.get_one ("Content-Type");
-        var features = msg.response_headers.get_one
-                            ("contentFeatures.dlna.org");
+                return;
+            }
 
-        if (!this.is_valid_mime_type (mime) &&
-            !this.is_playlist (mime, features)) {
-            debug ("Unsupported mime type %s", mime);
-            action.return_error (714, _("Illegal MIME-type"));
+            var mime = message.response_headers.get_one ("Content-Type");
+            var features = message.response_headers.get_one
+                                ("contentFeatures.dlna.org");
 
-            return;
-        }
+            if (!this.is_valid_mime_type (mime) &&
+                !this.is_playlist (mime, features)) {
+                debug ("Unsupported mime type %s", mime);
+                action.return_error (714, _("Illegal MIME-type"));
 
-        if (this.is_playlist (mime, features)) {
-            // Delay returning the action
-            this.handle_playlist.begin (action,
-                                        _uri,
-                                        _metadata,
-                                        mime,
-                                        features);
-        } else {
-            this.set_single_play_uri (action, _uri, _metadata, mime, features);
-        }
-    }
-
-    // HACK ALERT: This work around vala's feature of capturing 'this' pointer
-    // for all lambdas introduced in a class instance, even if 'this' is never
-    // used. Captured 'this' extends lifetime of an AVTransport instance beyond
-    // time expected by GUPnP. Due to GUPnP not using weak pointers at some
-    // places (e.g. xmlNode property of GUPnPServiceInfo), a crash happens when
-    // AVTransport is freed.
-    private static void setup_handle_new_transport_uri_callback
-                                    (AVTransport instance,
-                                     Message message,
-                                     string uri,
-                                     string metadata,
-                                     GUPnP.ServiceAction action) {
-        var weakme = WeakRef (instance);
-        var weakmsg = WeakRef (message);
-        //var weakact = WeakRef(action);
-        message.finished.connect( () => {
-            var me = (Rygel.AVTransport?) weakme.get();
-            var msg = (Soup.Message?) weakmsg.get();
-            //GUPnP.ServiceAction? act = (GUPnP.ServiceAction?)weakact.get();
-            if (me == null || msg == null) {
                 return;
             }
-            me.check_resource (msg, uri, metadata, action);
-        });
-    }
 
-    private void handle_new_transport_uri (ServiceAction action,
-                                           string        uri,
-                                           string        metadata) {
-        if (uri.has_prefix ("http://") || uri.has_prefix ("https://")) {
-            var new_uri = this.context.rewrite_uri (uri);
-            var message = new Message ("HEAD", new_uri);
-            message.request_headers.append ("getContentFeatures.dlna.org",
-                                            "1");
-            message.request_headers.append ("Connection", "close");
-            this.head_faked = false;
-            AVTransport.setup_handle_new_transport_uri_callback (this,
-                                                                 message,
-                                                                 new_uri,
-                                                                 metadata,
-                                                                 action);
-
-            this.session.queue_message (message, null);
-        } else {
-            this.set_single_play_uri (action, uri, metadata, null, null);
+            if (this.is_playlist (mime, features)) {
+                // Delay returning the action
+                yield handle_playlist (action,
+                                       uri,
+                                       metadata,
+                                       mime,
+                                       features);
+            } else {
+                this.set_single_play_uri (action, uri, metadata, mime, features);
+            }
+
+        } catch (Error error) {
+            // TRANSLATORS: first %s is a URI, the second an explanaition of
+            // the error
+            warning (_("Failed to access resource at %s: %s"),
+                    uri,
+                    message.reason_phrase);
+
+            action.return_error (716, _("Resource not found"));
+
+            return;
         }
     }
 
@@ -956,7 +906,7 @@ internal class Rygel.AVTransport : Service {
                                       string           metadata,
                                       string?          mime,
                                       string?          features) {
-            switch (action.get_name ()) {
+        switch (action.get_name ()) {
             case "SetAVTransportURI":
                 this.controller.set_single_play_uri (uri, metadata, mime, features);
                 break;
@@ -965,8 +915,8 @@ internal class Rygel.AVTransport : Service {
                 break;
             default:
                 assert_not_reached ();
-            }
+        }
 
-            action.return_success ();
+        action.return_success ();
     }
 }
diff --git a/src/librygel-server/rygel-client-hacks.vala b/src/librygel-server/rygel-client-hacks.vala
index 6891ebf3..82ddaf7e 100644
--- a/src/librygel-server/rygel-client-hacks.vala
+++ b/src/librygel-server/rygel-client-hacks.vala
@@ -129,20 +129,19 @@ internal abstract class Rygel.ClientHacks : GLib.Object {
 
     private void check_headers (Message message)
                                           throws ClientHacksError {
-        var headers = message.request_headers;
+        var headers = message.get_request_headers();
+        var remote_ip = "127.0.0.1"; //message.get_remote_host ();
 
         var agent = headers.get_one ("User-Agent");
         if (agent == null && client_agent_cache != null) {
-            var address = message.get_address ();
-            agent = client_agent_cache.get (address.get_physical ());
+            agent = client_agent_cache.get (remote_ip);
         }
 
         if (agent != null) {
-            var address = message.get_address ();
             if (client_agent_cache == null) {
                 client_agent_cache = new HashMap<string, string>();
             }
-            client_agent_cache.set (address.get_physical (), agent);
+            client_agent_cache.set (remote_ip, agent);
         }
 
         if (agent == null || !(this.agent_regex.match (agent))) {
diff --git a/src/librygel-server/rygel-data-sink.vala b/src/librygel-server/rygel-data-sink.vala
index 3e197f50..582cb815 100644
--- a/src/librygel-server/rygel-data-sink.vala
+++ b/src/librygel-server/rygel-data-sink.vala
@@ -30,7 +30,7 @@ using Soup;
 internal class Rygel.DataSink : Object {
     private DataSource source;
     private Server server;
-    private Message message;
+    private ServerMessage message;
 
     private const uint MAX_BUFFERED_CHUNKS = 32;
     private const uint MIN_BUFFERED_CHUNKS = 4;
@@ -41,7 +41,7 @@ internal class Rygel.DataSink : Object {
 
     public DataSink (DataSource source,
                      Server     server,
-                     Message    message,
+                     ServerMessage message,
                      HTTPSeekRequest?  offsets) {
         this.source = source;
         this.server = server;
@@ -56,7 +56,7 @@ internal class Rygel.DataSink : Object {
         this.message.wrote_chunk.connect (this.on_wrote_chunk);
     }
 
-    private void on_wrote_chunk (Soup.Message msg) {
+    private void on_wrote_chunk (Soup.ServerMessage msg) {
         this.chunks_buffered--;
         if (this.chunks_buffered < MIN_BUFFERED_CHUNKS) {
             this.source.thaw ();
@@ -72,7 +72,7 @@ internal class Rygel.DataSink : Object {
 
         var to_send = int64.min (buffer.length, left);
 
-        this.message.response_body.append_take (buffer[0:to_send]);
+        this.message.get_response_body ().append_take (buffer[0:to_send]);
         this.chunks_buffered++;
         this.bytes_sent += to_send;
 
diff --git a/src/librygel-server/rygel-dlna-available-seek-response.vala b/src/librygel-server/rygel-dlna-available-seek-response.vala
index c262d30e..0f4c021d 100644
--- a/src/librygel-server/rygel-dlna-available-seek-response.vala
+++ b/src/librygel-server/rygel-dlna-available-seek-response.vala
@@ -80,8 +80,8 @@ public class Rygel.DLNAAvailableSeekRangeResponse : Rygel.HTTPResponseElement {
     public override void add_response_headers (Rygel.HTTPRequest request) {
         var response = this.get_response_string ();
         if (response != null) {
-            request.msg.response_headers.append (AVAILABLE_SEEK_RANGE_HEADER,
-                                                 response);
+            request.msg.get_response_headers ().append (AVAILABLE_SEEK_RANGE_HEADER,
+                                                        response);
         }
     }
 
diff --git a/src/librygel-server/rygel-dtcp-cleartext-request.vala b/src/librygel-server/rygel-dtcp-cleartext-request.vala
index 3dfc6d8d..65699ff1 100644
--- a/src/librygel-server/rygel-dtcp-cleartext-request.vala
+++ b/src/librygel-server/rygel-dtcp-cleartext-request.vala
@@ -48,7 +48,7 @@ public class Rygel.DTCPCleartextRequest : Rygel.HTTPSeekRequest {
      */
     public int64 total_size { get; private set; }
 
-    public DTCPCleartextRequest (Soup.Message message,
+    public DTCPCleartextRequest (Soup.ServerMessage message,
                                  Rygel.HTTPGetHandler handler)
                                 throws HTTPSeekRequestError,
                                        HTTPRequestError {
@@ -73,7 +73,7 @@ public class Rygel.DTCPCleartextRequest : Rygel.HTTPSeekRequest {
             total_size = UNSPECIFIED;
         }
 
-        unowned string range = message.request_headers.get_one
+        unowned string range = message.get_request_headers ().get_one
                                         (DTCP_RANGE_HEADER);
 
         if (range == null) {
@@ -146,7 +146,7 @@ public class Rygel.DTCPCleartextRequest : Rygel.HTTPSeekRequest {
         this.total_size = total_size;
     }
 
-    public static bool supported (Soup.Message message,
+    public static bool supported (Soup.ServerMessage message,
                                   Rygel.HTTPGetHandler handler) {
         var resource_handler = handler as HTTPMediaResourceHandler;
 
@@ -155,7 +155,7 @@ public class Rygel.DTCPCleartextRequest : Rygel.HTTPSeekRequest {
                   .is_cleartext_range_support_enabled ();
     }
 
-    public static bool requested (Soup.Message message) {
-        return (message.request_headers.get_one (DTCP_RANGE_HEADER) != null);
+    public static bool requested (Soup.ServerMessage message) {
+        return (message.get_request_headers ().get_one (DTCP_RANGE_HEADER) != null);
     }
 }
diff --git a/src/librygel-server/rygel-dtcp-cleartext-response.vala b/src/librygel-server/rygel-dtcp-cleartext-response.vala
index 5dcac814..d73094f6 100644
--- a/src/librygel-server/rygel-dtcp-cleartext-response.vala
+++ b/src/librygel-server/rygel-dtcp-cleartext-response.vala
@@ -79,12 +79,12 @@ public class Rygel.DTCPCleartextResponse : Rygel.HTTPResponseElement {
                               + ( (this.total_size == UNSPECIFIED) ? "*"
                                   : this.total_size.to_string () );
 
-            request.msg.response_headers.append (DTCP_CONTENT_RANGE_HEADER,
+            request.msg.get_response_headers ().append (DTCP_CONTENT_RANGE_HEADER,
                                                  response);
         }
 
         if (this.encrypted_length != UNSPECIFIED) {
-            request.msg.response_headers.set_content_length
+            request.msg.get_response_headers ().set_content_length
                                         (this.encrypted_length);
         }
     }
diff --git a/src/librygel-server/rygel-http-byte-seek-request.vala b/src/librygel-server/rygel-http-byte-seek-request.vala
index 5f4e5928..cefd92cf 100644
--- a/src/librygel-server/rygel-http-byte-seek-request.vala
+++ b/src/librygel-server/rygel-http-byte-seek-request.vala
@@ -49,12 +49,12 @@ public class Rygel.HTTPByteSeekRequest : Rygel.HTTPSeekRequest {
     public int64 total_size { get; set; }
 
 
-    public HTTPByteSeekRequest (Soup.Message msg,
+    public HTTPByteSeekRequest (Soup.ServerMessage msg,
                                 Rygel.HTTPGetHandler handler)
                                throws HTTPSeekRequestError,
                                       HTTPRequestError {
         base ();
-        unowned string range = msg.request_headers.get_one ("Range");
+        unowned string range = msg.get_request_headers ().get_one ("Range");
         if (range == null) {
             throw new HTTPSeekRequestError.INVALID_RANGE ("Range header not present");
         }
@@ -86,8 +86,7 @@ public class Rygel.HTTPByteSeekRequest : Rygel.HTTPSeekRequest {
 
         var range_tokens = parsed_range.split ("-", 2);
 
-        if (!int64.try_parse (strip_leading_zeros (range_tokens[0]),
-                              out start_byte)) {
+        if (!int64.try_parse (range_tokens[0], out start_byte, null, 10)) {
             throw new HTTPSeekRequestError.INVALID_RANGE
                           ("Invalid Range start value: '%s'", range);
         }
@@ -109,13 +108,12 @@ public class Rygel.HTTPByteSeekRequest : Rygel.HTTPSeekRequest {
                 range_length = UNSPECIFIED;
             }
         } else {
-            if (!int64.try_parse (strip_leading_zeros(range_tokens[1]),
-                                  out end_byte)) {
+            if (!int64.try_parse (range_tokens[1], out end_byte, null, 10)) {
                 throw new HTTPSeekRequestError.INVALID_RANGE
                                        ("Invalid Range end value: '%s'", range);
             }
             if (end_byte < start_byte) {
-                var message = /*_*/("Range end value %lld is smaller than range start value %lld: '%s'");
+                var message = _ ("Range end value %lld is smaller than range start value %lld: '%s'");
                 throw new HTTPSeekRequestError.INVALID_RANGE (message,
                                                               end_byte,
                                                               start_byte,
@@ -131,34 +129,21 @@ public class Rygel.HTTPByteSeekRequest : Rygel.HTTPSeekRequest {
         this.total_size = total_size;
     }
 
-    public static bool supported (Soup.Message         message,
+    public static bool supported (Soup.ServerMessage         message,
                                   Rygel.HTTPGetHandler handler) {
         bool force_seek = false;
 
+#if 0
         try {
             var hack = ClientHacks.create (message);
             force_seek = hack.force_seek ();
         } catch (Error error) { }
+#endif
 
         return force_seek || handler.supports_byte_seek ();
     }
 
-    public static bool requested (Soup.Message msg) {
-        return (msg.request_headers.get_one ("Range") != null);
+    public static bool requested (Soup.ServerMessage msg) {
+        return (msg.get_request_headers ().get_one ("Range") != null);
     }
-
-    // Leading "0"s cause try_parse() to assume the value is octal (see Vala
-    // bug 656691) So we strip them off before passing to int64.try_parse()
-    private static string strip_leading_zeros (string number_string) {
-        int i=0;
-        while ((number_string[i] == '0') && (i < number_string.length)) {
-            i++;
-        }
-        if (i == 0) {
-            return number_string;
-        } else {
-            return number_string[i:number_string.length];
-        }
-    }
-
 }
diff --git a/src/librygel-server/rygel-http-byte-seek-response.vala b/src/librygel-server/rygel-http-byte-seek-response.vala
index 50ecbe72..bb11c0a3 100644
--- a/src/librygel-server/rygel-http-byte-seek-response.vala
+++ b/src/librygel-server/rygel-http-byte-seek-response.vala
@@ -68,11 +68,11 @@ public class Rygel.HTTPByteSeekResponse : Rygel.HTTPResponseElement {
     public override void add_response_headers (Rygel.HTTPRequest request) {
         if (this.end_byte != -1) {
             // Content-Range: bytes START_BYTE-END_BYTE/TOTAL_LENGTH (or "*")
-            request.msg.response_headers.set_content_range (this.start_byte,
+            request.msg.get_response_headers ().set_content_range (this.start_byte,
                                                             this.end_byte,
                                                             this.total_size);
-            request.msg.response_headers.append ("Accept-Ranges", "bytes");
-            request.msg.response_headers.set_content_length (this.range_length);
+            request.msg.get_response_headers ().append ("Accept-Ranges", "bytes");
+            request.msg.get_response_headers ().set_content_length (this.range_length);
         }
     }
 
diff --git a/src/librygel-server/rygel-http-get-handler.vala b/src/librygel-server/rygel-http-get-handler.vala
index 42adbc0f..441dbfe7 100644
--- a/src/librygel-server/rygel-http-get-handler.vala
+++ b/src/librygel-server/rygel-http-get-handler.vala
@@ -43,7 +43,7 @@ public abstract class Rygel.HTTPGetHandler: GLib.Object {
      */
     public virtual void add_response_headers (HTTPGet request)
                                               throws HTTPRequestError {
-        var mode = request.msg.request_headers.get_one (TRANSFER_MODE_HEADER);
+        var mode = request.msg.get_request_headers ().get_one (TRANSFER_MODE_HEADER);
 
         // Per DLNA 7.5.4.3.2.33.2, if the transferMode header is empty it
         // must be treated as Streaming mode or Interactive, depending upon
@@ -51,7 +51,7 @@ public abstract class Rygel.HTTPGetHandler: GLib.Object {
         if (mode == null) {
             mode = this.get_default_transfer_mode ();
         }
-        request.msg.response_headers.append (TRANSFER_MODE_HEADER, mode);
+        request.msg.get_response_headers ().append (TRANSFER_MODE_HEADER, mode);
 
         // Handle device-specific hacks that need to change the response
         // headers such as Samsung's subtitle stuff.
diff --git a/src/librygel-server/rygel-http-get.vala b/src/librygel-server/rygel-http-get.vala
index bfabc9bd..43146053 100644
--- a/src/librygel-server/rygel-http-get.vala
+++ b/src/librygel-server/rygel-http-get.vala
@@ -41,20 +41,21 @@ public class Rygel.HTTPGet : HTTPRequest {
 
     public HTTPGet (HTTPServer   http_server,
                     Soup.Server  server,
-                    Soup.Message msg) {
+                    Soup.ServerMessage msg) {
         base (http_server, server, msg);
     }
 
     protected override async void handle () throws Error {
         /* We only entertain 'HEAD' and 'GET' requests */
-        if (!(this.msg.method == "HEAD" || this.msg.method == "GET")) {
+        if (!(this.msg.get_method () == "HEAD" ||
+              this.msg.get_method () == "GET")) {
             throw new HTTPRequestError.BAD_REQUEST
                           (_("Invalid Request (only GET and HEAD supported)"));
         }
 
         { /* Check for proper content feature request */
             var cf_header = "getcontentFeatures.dlna.org";
-            var cf_val = this.msg.request_headers.get_one (cf_header);
+            var cf_val = this.msg.get_request_headers ().get_one (cf_header);
 
             if (cf_val != null && cf_val != "1") {
                 throw new HTTPRequestError.BAD_REQUEST (_(cf_header + " must be 1"));
@@ -79,7 +80,7 @@ public class Rygel.HTTPGet : HTTPRequest {
         }
 
         { // Check the transfer mode
-            var headers = this.msg.request_headers;
+            var headers = this.msg.get_request_headers ();
             var transfer_mode = headers.get_one (TRANSFER_MODE_HEADER);
 
             if (transfer_mode == null) {
@@ -87,7 +88,7 @@ public class Rygel.HTTPGet : HTTPRequest {
             }
 
             if (! this.handler.supports_transfer_mode (transfer_mode)) {
-                var msg = /*_*/("%s transfer mode not supported for '%s'");
+                var msg = _("%s transfer mode not supported for '%s'");
                 throw new HTTPRequestError.UNACCEPTABLE (msg,
                                                          transfer_mode,
                                                          uri.to_string ());
@@ -128,7 +129,7 @@ public class Rygel.HTTPGet : HTTPRequest {
         var requested_cleartext_seek = DTCPCleartextRequest.requested
             (this.msg);
 
-        var response_headers = this.msg.response_headers;
+        var response_headers = this.msg.get_response_headers ();
 
         // Order is significant here when the request has more than one seek
         // header
@@ -227,7 +228,7 @@ public class Rygel.HTTPGet : HTTPRequest {
 
         // Add headers
         this.handler.add_response_headers (this);
-        this.msg.response_headers.append ("Server",
+        this.msg.get_response_headers ().append ("Server",
                                           this.http_server.server_name);
 
         var response = this.handler.render_body (this);
@@ -326,7 +327,7 @@ public class Rygel.HTTPGet : HTTPRequest {
                         }
                         vary_header.append (PlaySpeedRequest.PLAYSPEED_HEADER);
                     }
-                    this.msg.response_headers.replace ("Vary", vary_header.str);
+                    this.msg.get_response_headers ().replace ("Vary", vary_header.str);
                 }
             }
         }
@@ -334,26 +335,26 @@ public class Rygel.HTTPGet : HTTPRequest {
         // Determine the status code
         {
             int response_code;
-            if (this.msg.response_headers.get_one ("Content-Range") != null) {
+            if (this.msg.get_response_headers ().get_one ("Content-Range") != null) {
                 response_code = Soup.Status.PARTIAL_CONTENT;
             } else {
                 response_code = Soup.Status.OK;
             }
-            this.msg.set_status (response_code);
+            this.msg.set_status (response_code, null);
         }
 
         if (msg.get_http_version () == Soup.HTTPVersion.@1_0) {
             // Set the response version to HTTP 1.1 (see DLNA 7.5.4.3.2.7.2)
             msg.set_http_version (Soup.HTTPVersion.@1_1);
-            msg.response_headers.append ("Connection", "close");
+            msg.get_response_headers ().append ("Connection", "close");
         }
 
         debug ("Following HTTP headers appended to response:");
-        this.msg.response_headers.foreach ((name, value) => {
+        this.msg.get_response_headers ().foreach ((name, value) => {
             debug ("    %s : %s", name, value);
         });
 
-        if (this.msg.method == "HEAD") {
+        if (this.msg.get_method () == "HEAD") {
             // Only headers requested, no need to send contents
             this.server.unpause_message (this.msg);
 
diff --git a/src/librygel-server/rygel-http-item-uri.vala b/src/librygel-server/rygel-http-item-uri.vala
index dd64ed7c..ca19fe27 100644
--- a/src/librygel-server/rygel-http-item-uri.vala
+++ b/src/librygel-server/rygel-http-item-uri.vala
@@ -165,7 +165,7 @@ public class Rygel.HTTPItemURI : Object {
             switch (parts[i]) {
                 case "i":
                     var data = this.base64_urldecode
-                                        (Soup.URI.decode (parts[i + 1]));
+                                        (GLib.Uri.unescape_string (parts[i + 1]));
                     StringBuilder builder = new StringBuilder ();
                     builder.append ((string) data);
                     this.item_id = builder.str;
@@ -180,7 +180,7 @@ public class Rygel.HTTPItemURI : Object {
 
                     break;
                 case "res":
-                    this.resource_name = Soup.URI.decode (parts[i + 1]);
+                    this.resource_name = GLib.Uri.unescape_string (parts[i + 1]);
 
                     break;
                 default:
diff --git a/src/librygel-server/rygel-http-post.vala b/src/librygel-server/rygel-http-post.vala
index d511a4b3..d72ca5e3 100644
--- a/src/librygel-server/rygel-http-post.vala
+++ b/src/librygel-server/rygel-http-post.vala
@@ -37,11 +37,11 @@ internal class Rygel.HTTPPost : HTTPRequest {
 
     public HTTPPost (HTTPServer   http_server,
                      Soup.Server  server,
-                     Soup.Message msg) {
+                     Soup.ServerMessage msg) {
         base (http_server, server, msg);
 
         this.cancellable.connect (this.on_request_cancelled);
-        msg.request_body.set_accumulate (false);
+        msg.get_request_body ().set_accumulate (false);
     }
 
     protected override async void handle () throws Error {
@@ -91,7 +91,7 @@ internal class Rygel.HTTPPost : HTTPRequest {
         yield;
     }
 
-    private void on_got_body (Message msg) {
+    private void on_got_body (ServerMessage msg) {
         if (this.msg != msg) {
             return;
         }
@@ -202,9 +202,10 @@ internal class Rygel.HTTPPost : HTTPRequest {
         this.handle_continue ();
     }
 
-    private void on_got_chunk (Message msg, Buffer chunk) {
+    private void on_got_chunk (ServerMessage msg, Bytes chunk) {
         try {
-            this.stream.write_all (chunk.data, null, this.cancellable);
+            var data = chunk.get_data ();
+            this.stream.write_all (data, null, this.cancellable);
         } catch (Error error) {
             this.disconnect_message_signals ();
             this.handle_error (
diff --git a/src/librygel-server/rygel-http-request.vala b/src/librygel-server/rygel-http-request.vala
index e67a475b..fd13b06c 100644
--- a/src/librygel-server/rygel-http-request.vala
+++ b/src/librygel-server/rygel-http-request.vala
@@ -39,7 +39,7 @@ public abstract class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
     public unowned HTTPServer http_server;
     private MediaContainer root_container;
     public unowned Soup.Server server;
-    public Soup.Message msg;
+    public Soup.ServerMessage msg;
 
     public Cancellable cancellable { get; set; }
 
@@ -50,23 +50,25 @@ public abstract class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
 
     protected HTTPRequest (HTTPServer   http_server,
                            Soup.Server  server,
-                           Soup.Message msg) {
+                           Soup.ServerMessage msg) {
         this.http_server = http_server;
         this.cancellable = new Cancellable ();
         this.root_container = http_server.root_container;
         this.server = server;
         this.msg = msg;
 
+#if 0
         try {
             this.hack = ClientHacks.create (msg);
         } catch (Error error) { }
+#endif
     }
 
     public async void run () {
         this.server.pause_message (this.msg);
 
         try {
-            this.uri = new HTTPItemURI.from_string (this.msg.uri.path,
+            this.uri = new HTTPItemURI.from_string (this.msg.get_uri().get_path (),
                                                     this.http_server);
 
             yield this.find_item ();
@@ -115,11 +117,7 @@ public abstract class Rygel.HTTPRequest : GLib.Object, Rygel.StateMachine {
 
     protected void end (uint status, string ? reason = null) {
         if (status != Soup.Status.NONE) {
-            if (reason == null) {
-                this.msg.set_status (status);
-            } else {
-                this.msg.set_status_full (status, reason);
-            }
+            this.msg.set_status (status, reason);
         }
 
         this.completed ();
diff --git a/src/librygel-server/rygel-http-resource-handler.vala b/src/librygel-server/rygel-http-resource-handler.vala
index af6012b5..657d1d4e 100644
--- a/src/librygel-server/rygel-http-resource-handler.vala
+++ b/src/librygel-server/rygel-http-resource-handler.vala
@@ -55,14 +55,14 @@ internal class Rygel.HTTPMediaResourceHandler : HTTPGetHandler {
         var mime_type = MediaObject.apply_replacements
                                      (replacements,
                                       this.media_resource.mime_type);
-        request.msg.response_headers.append ("Content-Type", mime_type);
+        request.msg.get_response_headers ().append ("Content-Type", mime_type);
 
         // Add contentFeatures.dlna.org
         var protocol_info = media_resource.get_protocol_info (replacements);
         if (protocol_info != null) {
             var pi_fields = protocol_info.to_string ().split (":", 4);
             if (pi_fields != null && pi_fields[3] != null) {
-                request.msg.response_headers.append ("contentFeatures.dlna.org",
+                request.msg.get_response_headers ().append ("contentFeatures.dlna.org",
                                                      pi_fields[3]);
             }
         }
diff --git a/src/librygel-server/rygel-http-response.vala b/src/librygel-server/rygel-http-response.vala
index cee143e5..7963a5b0 100644
--- a/src/librygel-server/rygel-http-response.vala
+++ b/src/librygel-server/rygel-http-response.vala
@@ -29,7 +29,7 @@ using Soup;
 
 public class Rygel.HTTPResponse : GLib.Object, Rygel.StateMachine {
     public unowned Soup.Server server { get; private set; }
-    public Soup.Message msg;
+    public Soup.ServerMessage msg;
 
     public Cancellable cancellable { get; set; }
 
@@ -44,7 +44,7 @@ public class Rygel.HTTPResponse : GLib.Object, Rygel.StateMachine {
                 return this._priority;
             }
 
-            var mode = this.msg.request_headers.get_one
+            var mode = this.msg.get_request_headers ().get_one
                                         ("transferMode.dlna.org");
 
             if (mode == null || mode == "Interactive") {
@@ -91,7 +91,7 @@ public class Rygel.HTTPResponse : GLib.Object, Rygel.StateMachine {
             this.cancellable.cancelled.connect (this.on_cancelled);
         }
 
-        this.msg.response_body.set_accumulate (false);
+        this.msg.get_response_body ().set_accumulate (false);
 
         this.server.weak_ref (this.on_server_weak_ref);
         this.unref_soup_server = true;
@@ -125,10 +125,10 @@ public class Rygel.HTTPResponse : GLib.Object, Rygel.StateMachine {
     public virtual void end (bool aborted, uint status) {
         this.src.stop ();
 
-        var encoding = this.msg.response_headers.get_encoding ();
+        var encoding = this.msg.get_response_headers ().get_encoding ();
 
         if (!aborted && encoding != Encoding.CONTENT_LENGTH) {
-            this.msg.response_body.complete ();
+            this.msg.get_response_body ().complete ();
             this.server.unpause_message (this.msg);
         }
 
@@ -137,14 +137,15 @@ public class Rygel.HTTPResponse : GLib.Object, Rygel.StateMachine {
         }
 
         if (status != Soup.Status.NONE) {
-            this.msg.set_status (status);
+            this.msg.set_status (status, null);
         }
 
         this.completed ();
     }
 
     private void on_cancelled (Cancellable cancellable) {
-        this.end (true, Soup.Status.CANCELLED);
+        // FIXME - How to properly cancel this?
+        this.end (true, Soup.Status.SERVICE_UNAVAILABLE);
     }
 
     private void on_server_weak_ref (GLib.Object object) {
diff --git a/src/librygel-server/rygel-http-server.vala b/src/librygel-server/rygel-http-server.vala
index 20e3eeb2..38e97b31 100644
--- a/src/librygel-server/rygel-http-server.vala
+++ b/src/librygel-server/rygel-http-server.vala
@@ -152,24 +152,23 @@ public class Rygel.HTTPServer : GLib.Object, Rygel.StateMachine {
         this.requests.remove (request);
 
         debug ("HTTP %s request for URI '%s' handled.",
-               request.msg.method,
-               request.msg.get_uri ().to_string (false));
+               request.msg.get_method (),
+               request.msg.get_uri ().to_string ());
     }
 
     private void server_handler (Soup.Server               server,
-                                 Soup.Message              msg,
+                                 Soup.ServerMessage        msg,
                                  string                    server_path,
-                                 HashTable<string,string>? query,
-                                 Soup.ClientContext        soup_client) {
-        if (msg.method == "POST") {
+                                 HashTable<string,string>? query) {
+        if (msg.get_method () == "POST") {
             // Already handled
             return;
         }
 
         debug ("HTTP %s request for URI '%s'. Headers:",
-               msg.method,
-               msg.get_uri ().to_string (false));
-        msg.request_headers.foreach ((name, value) => {
+               msg.get_method (),
+               msg.get_uri ().to_string ());
+        msg.get_request_headers ().foreach ((name, value) => {
                 debug ("    %s : %s", name, value);
         });
 
@@ -177,14 +176,13 @@ public class Rygel.HTTPServer : GLib.Object, Rygel.StateMachine {
     }
 
     private void on_request_aborted (Soup.Server        server,
-                                     Soup.Message       message,
-                                     Soup.ClientContext client) {
+                                     Soup.ServerMessage message) {
         foreach (var request in this.requests) {
             if (request.msg == message) {
                 request.cancellable.cancel ();
                 debug ("HTTP client aborted %s request for URI '%s'.",
-                       request.msg.method,
-                       request.msg.get_uri ().to_string (false));
+                       request.msg.get_method (),
+                       request.msg.get_uri ().to_string ());
 
                 break;
             }
@@ -192,22 +190,20 @@ public class Rygel.HTTPServer : GLib.Object, Rygel.StateMachine {
     }
 
     private void on_request_started (Soup.Server        server,
-                                     Soup.Message       message,
-                                     Soup.ClientContext client) {
+                                     Soup.ServerMessage  message) {
         message.got_headers.connect (this.on_got_headers);
     }
 
     private void on_request_read (Soup.Server        server,
-                                  Soup.Message       message,
-                                  Soup.ClientContext client) {
-        var agent = message.request_headers.get_one ("User-Agent");
+                                  Soup.ServerMessage message) {
+        var agent = message.get_request_headers ().get_one ("User-Agent");
 
         if (agent == null) {
-            var host = client.get_host ();
+            var host = message.get_remote_host ();
             agent = this.context.guess_user_agent (host);
             if (agent != null) {
-                debug ("Guessed user agent %s for %s", agent, client.get_host ());
-                message.request_headers.append ("User-Agent", agent);
+                debug ("Guessed user agent %s for %s", agent, host);
+                message.get_request_headers ().append ("User-Agent", agent);
             } else {
                 debug ("Could not guess user agent for ip %s.", host);
             }
@@ -215,11 +211,11 @@ public class Rygel.HTTPServer : GLib.Object, Rygel.StateMachine {
 
     }
 
-    private void on_got_headers (Soup.Message msg) {
-        if (msg.method == "POST" &&
-            msg.uri.path.has_prefix (this.path_root)) {
+    private void on_got_headers (Soup.ServerMessage msg) {
+        if (msg.get_method () == "POST" &&
+            msg.get_uri ().get_path ().has_prefix (this.path_root)) {
             debug ("HTTP POST request for URI '%s'",
-                   msg.get_uri ().to_string (false));
+                   msg.get_uri ().to_string ());
 
             this.queue_request (new HTTPPost (this, this.context.server, msg));
         }
diff --git a/src/librygel-server/rygel-http-subtitle-handler.vala b/src/librygel-server/rygel-http-subtitle-handler.vala
index fea88e8c..be2043ed 100644
--- a/src/librygel-server/rygel-http-subtitle-handler.vala
+++ b/src/librygel-server/rygel-http-subtitle-handler.vala
@@ -64,7 +64,7 @@ internal class Rygel.HTTPSubtitleHandler : Rygel.HTTPGetHandler {
     public override void add_response_headers (HTTPGet request)
                                                throws HTTPRequestError {
         // Add Content-Type
-        request.msg.response_headers.append ("Content-Type",
+        request.msg.get_response_headers ().append ("Content-Type",
                                              subtitle.mime_type);
 
         // Add contentFeatures.dlna.org
@@ -74,7 +74,7 @@ internal class Rygel.HTTPSubtitleHandler : Rygel.HTTPGetHandler {
         var res = this.media_item.get_resource_list ().get (0);
         var protocol_info = res.get_protocol_info ().to_string ();
         var pi_fields = protocol_info.split (":", 4);
-        request.msg.response_headers.append ("contentFeatures.dlna.org",
+        request.msg.get_response_headers ().append ("contentFeatures.dlna.org",
                                              pi_fields[3]);
 
         // Chain-up
diff --git a/src/librygel-server/rygel-http-thumbnail-handler.vala b/src/librygel-server/rygel-http-thumbnail-handler.vala
index 579c484e..482b5d10 100644
--- a/src/librygel-server/rygel-http-thumbnail-handler.vala
+++ b/src/librygel-server/rygel-http-thumbnail-handler.vala
@@ -67,7 +67,7 @@ internal class Rygel.HTTPThumbnailHandler : Rygel.HTTPGetHandler {
     public override void add_response_headers (HTTPGet request)
                                                throws HTTPRequestError {
         // Add Content-Type
-        request.msg.response_headers.append ("Content-Type",
+        request.msg.get_response_headers ().append ("Content-Type",
                                              thumbnail.mime_type);
 
         // Add contentFeatures.dlna.org
@@ -76,7 +76,7 @@ internal class Rygel.HTTPThumbnailHandler : Rygel.HTTPGetHandler {
                                          this.thumbnail_index);
         var protocol_info = res.get_protocol_info ().to_string ();
         var pi_fields = protocol_info.split (":", 4);
-        request.msg.response_headers.append ("contentFeatures.dlna.org",
+        request.msg.get_response_headers ().append ("contentFeatures.dlna.org",
                                              pi_fields[3]);
 
         // Chain-up
diff --git a/src/librygel-server/rygel-http-time-seek-request.vala b/src/librygel-server/rygel-http-time-seek-request.vala
index 1c0d9503..26e2ce84 100644
--- a/src/librygel-server/rygel-http-time-seek-request.vala
+++ b/src/librygel-server/rygel-http-time-seek-request.vala
@@ -68,7 +68,7 @@ public class Rygel.HTTPTimeSeekRequest : Rygel.HTTPSeekRequest {
      * @param request The HTTP GET/HEAD request
      * @param speed An associated speed request
      */
-    internal HTTPTimeSeekRequest (Soup.Message message,
+    internal HTTPTimeSeekRequest (Soup.ServerMessage message,
                                   HTTPGetHandler handler,
                                   PlaySpeed? speed)
                                   throws HTTPSeekRequestError {
@@ -82,7 +82,7 @@ public class Rygel.HTTPTimeSeekRequest : Rygel.HTTPSeekRequest {
             this.total_duration = UNSPECIFIED;
         }
 
-        var range = message.request_headers.get_one (TIMESEEKRANGE_HEADER);
+        var range = message.get_request_headers ().get_one (TIMESEEKRANGE_HEADER);
 
         if (range == null) {
             throw new HTTPSeekRequestError.INVALID_RANGE ("%s not present",
@@ -205,14 +205,16 @@ public class Rygel.HTTPTimeSeekRequest : Rygel.HTTPSeekRequest {
      * This method utilizes elements associated with the request to determine if
      * a TimeSeekRange request is supported for the given request/resource.
      */
-    public static bool supported (Soup.Message message,
+    public static bool supported (Soup.ServerMessage message,
                                   HTTPGetHandler handler) {
         bool force_seek = false;
 
+#if 0
         try {
             var hack = ClientHacks.create (message);
             force_seek = hack.force_seek ();
         } catch (Error error) { /* Exception means no hack needed */ }
+#endif
 
         return force_seek || handler.supports_time_seek ();
     }
@@ -220,8 +222,8 @@ public class Rygel.HTTPTimeSeekRequest : Rygel.HTTPSeekRequest {
     /**
      * Return true of the HTTPGet contains a TimeSeekRange request.
      */
-    public static bool requested (Soup.Message message) {
-        var header = message.request_headers.get_one (TIMESEEKRANGE_HEADER);
+    public static bool requested (Soup.ServerMessage message) {
+        var header = message.get_request_headers ().get_one (TIMESEEKRANGE_HEADER);
 
         return (header != null);
     }
diff --git a/src/librygel-server/rygel-http-time-seek-response.vala b/src/librygel-server/rygel-http-time-seek-response.vala
index 905c83f8..8e69a8af 100644
--- a/src/librygel-server/rygel-http-time-seek-response.vala
+++ b/src/librygel-server/rygel-http-time-seek-response.vala
@@ -168,7 +168,7 @@ public class Rygel.HTTPTimeSeekResponse : Rygel.HTTPResponseElement {
     public override void add_response_headers (Rygel.HTTPRequest request) {
         var response = get_response_string ();
         if (response != null) {
-            var headers = request.msg.response_headers;
+            var headers = request.msg.get_response_headers ();
             headers.append (HTTPTimeSeekRequest.TIMESEEKRANGE_HEADER, response);
             if (this.response_length != UNSPECIFIED) {
                 // Note: Don't use set_content_range () here - we don't want a
diff --git a/src/librygel-server/rygel-import-resource.vala b/src/librygel-server/rygel-import-resource.vala
index a0c6ee6b..ff619c9f 100644
--- a/src/librygel-server/rygel-import-resource.vala
+++ b/src/librygel-server/rygel-import-resource.vala
@@ -72,7 +72,6 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
     private HTTPServer http_server;
     private MediaContainer root_container;
     private ServiceAction action;
-    private SourceFunc run_callback;
     private FileOutputStream output_stream;
 
     public ImportResource (ContentDirectory    content_dir,
@@ -144,23 +143,46 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
                                          Priority.DEFAULT,
                                          this.cancellable);
             var message = new Message ("GET", source_uri);
-            message.got_chunk.connect (this.got_chunk_cb);
-            message.got_body.connect (this.got_body_cb);
-            message.got_headers.connect (this.got_headers_cb);
-            message.finished.connect (this.finished_cb);
-            message.response_body.set_accumulate (false);
-
-            this.run_callback = run.callback;
-            this.session.queue_message (message, null);
 
             debug ("Importing resource from %s to %s",
                    source_uri,
                    this.item.get_primary_uri ());
 
-            yield;
+            var stream = yield this.session.send_async (message, Priority.DEFAULT, this.cancellable);
+            if (!(message.status_code >= 200 && message.status_code <= 299)) {
+                handle_transfer_error (message);
+
+                this.completed();
+                return;
+            }
+
+            this.bytes_total = message.response_headers.get_content_length ();
+            this.action.return_success ();
+            this.action = null;
+            this.bytes_copied = yield this.output_stream.splice_async (stream,
+                                                           OutputStreamSpliceFlags.CLOSE_SOURCE |
+                                                           OutputStreamSpliceFlags.CLOSE_TARGET,
+                                                           Priority.DEFAULT,
+                                                           this.cancellable);
+
+            if (this.bytes_total == 0) {
+                this.bytes_total = this.bytes_copied;
+            } else if (this.bytes_total != this.bytes_copied) {
+                warning ("Importing sizes did not match: %z vs. %z", this.bytes_total, this.bytes_copied);
+                this.status = TransferStatus.ERROR;
+            }
+
+            if (this.status == TransferStatus.IN_PROGRESS) {
+                this.status = TransferStatus.COMPLETED;
+            }
         } catch (Error err) {
             warning ("%s", err.message);
-            this.status = TransferStatus.ERROR;
+            if (err is IOError.CANCELLED) {
+                this.status = TransferStatus.STOPPED;
+            } else {
+                this.status = TransferStatus.ERROR;
+            }
+
             yield queue.remove_now (this.item, this.cancellable);
         }
 
@@ -203,67 +225,6 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
         return media_item;
     }
 
-    private void got_headers_cb (Message message) {
-        this.bytes_total = message.response_headers.get_content_length ();
-
-        if (message.status_code >= 200 && message.status_code <= 299) {
-            this.action.return_success ();
-        } else {
-            this.handle_transfer_error (message);
-        }
-
-        this.action = null;
-    }
-
-    private void got_chunk_cb (Message message, Buffer buffer) {
-        this.bytes_copied += buffer.length;
-        try {
-            size_t bytes_written;
-
-            this.output_stream.write_all (buffer.data,
-                                          out bytes_written,
-                                          this.cancellable);
-        } catch (Error error) {
-            warning ("%s", error.message);
-            if (error is IOError.CANCELLED) {
-                this.status = TransferStatus.STOPPED;
-            } else {
-                this.status = TransferStatus.ERROR;
-            }
-            this.session.cancel_message (message, Status.CANCELLED);
-        }
-    }
-
-    private void got_body_cb (Message message) {
-        if (this.bytes_total == 0) {
-            this.bytes_total = this.bytes_copied;
-        } else if (this.bytes_total != this.bytes_copied) {
-            this.status = TransferStatus.ERROR;
-
-            return;
-        }
-
-        try {
-            this.output_stream.close (this.cancellable);
-            if (this.status == TransferStatus.IN_PROGRESS) {
-                this.status = TransferStatus.COMPLETED;
-            }
-        } catch (Error error) {
-            warning ("%s", error.message);
-            this.status = TransferStatus.ERROR;
-        }
-    }
-
-    private void finished_cb (Message message) {
-        if (this.status == TransferStatus.IN_PROGRESS) {
-            if (!(message.status_code >= 200 && message.status_code <= 299)) {
-                this.handle_transfer_error (message);
-            }
-        }
-
-        this.run_callback ();
-    }
-
     private void handle_transfer_error (Message message) {
         this.status = TransferStatus.ERROR;
         try {
diff --git a/src/librygel-server/rygel-media-query-action.vala b/src/librygel-server/rygel-media-query-action.vala
index af4c2083..f5eb50f0 100644
--- a/src/librygel-server/rygel-media-query-action.vala
+++ b/src/librygel-server/rygel-media-query-action.vala
@@ -60,9 +60,11 @@ internal abstract class Rygel.MediaQueryAction : GLib.Object, StateMachine {
 
         this.serializer = new Serializer (SerializerType.GENERIC_DIDL);
 
+#if 0
         try {
             this.hacks = ClientHacks.create (this.action.get_message ());
         } catch { /* This just means we need no hacks, yay! */ }
+#endif
     }
 
     public async void run () {
diff --git a/src/librygel-server/rygel-object-creator.vala b/src/librygel-server/rygel-object-creator.vala
index e7ddd982..15f9cae2 100644
--- a/src/librygel-server/rygel-object-creator.vala
+++ b/src/librygel-server/rygel-object-creator.vala
@@ -597,9 +597,9 @@ internal class Rygel.ObjectCreator: GLib.Object, Rygel.StateMachine {
             return;
         }
 
-        var parsed_date = new Soup.Date.from_string (didl_item.date);
+        var parsed_date = new GLib.DateTime.from_iso8601 (didl_item.date, null);
         if (parsed_date != null) {
-            item.date = parsed_date.to_string (Soup.DateFormat.ISO8601);
+            item.date = GUPnP.format_date_time_for_didl_lite (parsed_date);
 
             return;
         }
@@ -674,15 +674,13 @@ internal class Rygel.ObjectCreator: GLib.Object, Rygel.StateMachine {
             return false;
         }
 
-        var soup_uri = new Soup.URI (uri);
-
-        if (soup_uri == null || soup_uri.scheme == null) {
+        try {
+            var parsed_uri = GLib.Uri.parse (uri, GLib.UriFlags.NONE);
+            sanitized_uri = parsed_uri.to_string();
+            return true;
+        } catch (Error err) {
             return false;
         }
-
-        sanitized_uri = soup_uri.to_string (false);
-
-        return true;
     }
 
     /**
diff --git a/src/librygel-server/rygel-playspeed-request.vala b/src/librygel-server/rygel-playspeed-request.vala
index 33fa1cd6..d43db4c4 100644
--- a/src/librygel-server/rygel-playspeed-request.vala
+++ b/src/librygel-server/rygel-playspeed-request.vala
@@ -44,7 +44,7 @@ public class Rygel.PlaySpeedRequest : GLib.Object {
     }
 
     internal static bool requested (HTTPGet request) {
-        return request.msg.request_headers.get_one (PLAYSPEED_HEADER) != null;
+        return request.msg.get_request_headers ().get_one (PLAYSPEED_HEADER) != null;
     }
 
     public PlaySpeedRequest (int numerator, uint denominator) {
@@ -61,7 +61,7 @@ public class Rygel.PlaySpeedRequest : GLib.Object {
                                             throws PlaySpeedError {
         base ();
         // Format: PlaySpeed.dlna.org: speed=<rate>
-        string speed_string = request.msg.request_headers.get_one
+        string speed_string = request.msg.get_request_headers ().get_one
                                         (PLAYSPEED_HEADER);
 
         if (speed_string == null) {
diff --git a/src/librygel-server/rygel-playspeed-response.vala b/src/librygel-server/rygel-playspeed-response.vala
index c014861b..09819450 100644
--- a/src/librygel-server/rygel-playspeed-response.vala
+++ b/src/librygel-server/rygel-playspeed-response.vala
@@ -62,7 +62,7 @@ public class Rygel.PlaySpeedResponse : Rygel.HTTPResponseElement {
 
     public override void add_response_headers (Rygel.HTTPRequest request) {
         if (!this.speed.is_normal_rate ()) {
-            var headers = request.msg.response_headers;
+            var headers = request.msg.get_response_headers ();
 
             // Format: PlaySpeed.dlna.org: speed=<rate>
             headers.append (PlaySpeedRequest.PLAYSPEED_HEADER,
diff --git a/src/librygel-server/rygel-samsung-tv-hacks.vala b/src/librygel-server/rygel-samsung-tv-hacks.vala
index b005e656..2f096dc6 100644
--- a/src/librygel-server/rygel-samsung-tv-hacks.vala
+++ b/src/librygel-server/rygel-samsung-tv-hacks.vala
@@ -86,7 +86,7 @@ internal class Rygel.SamsungTVHacks : ClientHacks {
     public override void modify_headers (HTTPRequest request) {
         var item = request.object as VideoItem;
 
-        if (request.msg.request_headers.get_one ("getCaptionInfo.sec") != null
+        if (request.msg.get_request_headers ().get_one ("getCaptionInfo.sec") != null
             && item != null
             && item.subtitles.size > 0) {
                 var caption_uri = request.http_server.create_uri_for_object
@@ -95,8 +95,8 @@ internal class Rygel.SamsungTVHacks : ClientHacks {
                                          0, // FIXME: offer first subtitle only?
                                          null);
 
-                request.msg.response_headers.append ("CaptionInfo.sec",
-                                                     caption_uri);
+                request.msg.get_response_headers().append ("CaptionInfo.sec",
+                                                           caption_uri);
         }
     }
 }
diff --git a/src/librygel-server/rygel-xbox-hacks.vala b/src/librygel-server/rygel-xbox-hacks.vala
index f42f2b48..751b520f 100644
--- a/src/librygel-server/rygel-xbox-hacks.vala
+++ b/src/librygel-server/rygel-xbox-hacks.vala
@@ -43,24 +43,43 @@ internal class Rygel.XBoxHacks : ClientHacks {
             return;
         }
 
-        unowned Soup.URI uri = message.get_uri ();
-        unowned string query = uri.query;
+        var query = message.uri.get_query ();
         if (query == null) {
             return;
         }
-        var params = Soup.Form.decode (query);
-        var album_art = params.lookup ("albumArt");
 
-        if ((album_art == null) || !bool.parse (album_art)) {
+        var iter = GLib.UriParamsIter (query);
+        string param;
+        string val;
+        bool rewrite = false;
+        try {
+            while (iter.next (out param, out val)) {
+                if (param == "albumArt") {
+                    if (!bool.parse (val)) {
+                        return;
+                    } else {
+                        rewrite = true;
+
+                        break;
+                    }
+                }
+            }
+        } catch (Error error) {
+            return;
+        }
+
+        if (!rewrite) {
             return;
         }
 
-        var path = uri.get_path ();
+        var path = message.uri.get_path ();
         var particles = path.split ("/")[0:4];
         particles += "th";
         particles += "0";
 
-        uri.set_path (string.joinv ("/", particles));
+        message.uri = Soup.uri_copy (message.uri,
+                                     Soup.URIComponent.PATH, string.joinv ("/", particles),
+                                     Soup.URIComponent.NONE);
     }
 
     public void apply_on_device (RootDevice device,
diff --git a/src/media-engines/gstreamer/rygel-gst-utils.vala b/src/media-engines/gstreamer/rygel-gst-utils.vala
index a9dcf7f2..e205b643 100644
--- a/src/media-engines/gstreamer/rygel-gst-utils.vala
+++ b/src/media-engines/gstreamer/rygel-gst-utils.vala
@@ -49,7 +49,7 @@ internal abstract class Rygel.GstUtils {
 
             if (uri.has_prefix ("gst-launch://")) {
                 var description = uri.replace ("gst-launch://", "");
-                description = Soup.URI.decode (description);
+                description = GLib.Uri.unescape_string (description);
 
                 src = Gst.parse_bin_from_description (description, true);
             } else if (uri.has_prefix ("dvd://")) {
@@ -60,12 +60,12 @@ internal abstract class Rygel.GstUtils {
                     return null;
                 }
 
-                var tmp = new Soup.URI (uri);
-                var query = Soup.Form.decode (tmp.query);
+                var tmp = GLib.Uri.parse (uri, UriFlags.NONE);
+                var query = GLib.Uri.parse_params (tmp.get_query ());
                 if (query.contains ("title")) {
                     src.title = int.parse (query.lookup ("title"));
                 }
-                src.device = Soup.URI.decode (tmp.path);
+                src.device = GLib.Uri.unescape_string (tmp.get_path ());
             } else {
                 var file = File.new_for_uri (uri);
                 var path = file.get_path ();
diff --git a/src/plugins/gst-launch/rygel-gst-launch-audio-item.vala b/src/plugins/gst-launch/rygel-gst-launch-audio-item.vala
index 42b35b1a..2f8226af 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-audio-item.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-audio-item.vala
@@ -37,6 +37,6 @@ public class Rygel.GstLaunch.AudioItem : Rygel.AudioItem {
         base (id, parent, title);
 
         this.mime_type = mime_type;
-        this.add_uri ("gst-launch://" + Soup.URI.encode (launch_line, ".!"));
+        this.add_uri ("gst-launch://" + GLib.Uri.escape_string (launch_line, ".!"));
     }
 }
diff --git a/src/plugins/gst-launch/rygel-gst-launch-video-item.vala b/src/plugins/gst-launch/rygel-gst-launch-video-item.vala
index f2ed1669..da27b3be 100644
--- a/src/plugins/gst-launch/rygel-gst-launch-video-item.vala
+++ b/src/plugins/gst-launch/rygel-gst-launch-video-item.vala
@@ -38,6 +38,6 @@ public class Rygel.GstLaunch.VideoItem : Rygel.VideoItem {
         base (id, parent, title);
 
         this.mime_type = mime_type;
-        this.add_uri ("gst-launch://" + Soup.URI.encode (launch_line, ".!"));
+        this.add_uri ("gst-launch://" + GLib.Uri.escape_string (launch_line, ".!"));
     }
 }
diff --git a/src/plugins/media-export/rygel-media-export-dvd-parser.vala b/src/plugins/media-export/rygel-media-export-dvd-parser.vala
index d9bb3928..cd981d01 100644
--- a/src/plugins/media-export/rygel-media-export-dvd-parser.vala
+++ b/src/plugins/media-export/rygel-media-export-dvd-parser.vala
@@ -78,6 +78,8 @@ internal class Rygel.MediaExport.DVDParser : Extractor {
         var uri = this.serialized_info.lookup_value (Serializer.URI,
                                                      VariantType.STRING);
 
+        var file_uri = GLib.Uri.parse (uri.get_string(), GLib.UriFlags.NONE);
+
         // Unset size
         this.serialized_info.insert (Serializer.SIZE, "i", -1);
 
@@ -86,9 +88,10 @@ internal class Rygel.MediaExport.DVDParser : Extractor {
         if ((xpo != null) &&
             (xpo->type == Xml.XPath.ObjectType.NODESET) &&
             (xpo->nodesetval->length () == 1)) {
-            var new_uri = new Soup.URI (uri.get_string ());
-            new_uri.set_scheme ("dvd");
-            new_uri.set_query ("title=1");
+            var new_uri = Soup.uri_copy(file_uri,
+                                        Soup.URIComponent.SCHEME, "dvd",
+                                        Soup.URIComponent.QUERY, "title=1",
+                                        Soup.URIComponent.NONE);
             this.serialized_info.insert (Serializer.UPNP_CLASS,
                                          "s",
                                          UPNP_CLASS_VIDEO);
@@ -96,7 +99,7 @@ internal class Rygel.MediaExport.DVDParser : Extractor {
                                          "dvd-track:" + id.get_string () + ":0");
             this.serialized_info.insert (Serializer.MIME_TYPE, "s", "video/mpeg");
             this.serialized_info.insert (Serializer.URI, "s",
-                                         new_uri.to_string (false));
+                                         new_uri.to_string ());
 
             var node = xpo->nodesetval->item (0);
 
diff --git a/src/plugins/media-export/rygel-media-export-dvd-track.vala b/src/plugins/media-export/rygel-media-export-dvd-track.vala
index a23267ee..0255db05 100644
--- a/src/plugins/media-export/rygel-media-export-dvd-track.vala
+++ b/src/plugins/media-export/rygel-media-export-dvd-track.vala
@@ -47,10 +47,18 @@ internal class Rygel.MediaExport.DVDTrack : VideoItem {
         // If we are created with a null node, then we are created from the
         // database and all the information is already there.
         if (this.node != null) {
-            var uri = new Soup.URI (this.parent.get_primary_uri ());
-            uri.set_scheme ("dvd");
-            uri.set_query ("title=%d".printf (track + 1));
-            this.add_uri (uri.to_string (false));
+            GLib.Uri uri;
+            try {
+                uri = GLib.Uri.parse (this.parent.get_primary_uri (), UriFlags.NONE);
+            } catch (Error error) {
+                assert_not_reached ();
+            }
+            uri = Soup.uri_copy (uri,
+                                 Soup.URIComponent.SCHEME, "dvd",
+                                 Soup.URIComponent.QUERY, "title=%d".printf (track + 1),
+                                 Soup.URIComponent.NONE);
+
+            this.add_uri (uri.to_string ());
 
             this.dlna_profile = "MPEG_PS";
             this.mime_type = "video/mpeg";
diff --git a/src/plugins/media-export/rygel-media-export-extractor.vala b/src/plugins/media-export/rygel-media-export-extractor.vala
index 93d5fe9c..01db3d00 100644
--- a/src/plugins/media-export/rygel-media-export-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-extractor.vala
@@ -145,8 +145,8 @@ public class Rygel.MediaExport.Extractor : Object {
         var date  = this.serialized_info.lookup_value (Serializer.DATE,
                                                        VariantType.STRING);
         if ("T" in date.get_string ()) {
-            var fixed_date = new Soup.Date.from_string (date.get_string ());
-            var new_date = fixed_date.to_string (Soup.DateFormat.ISO8601_FULL);
+            var fixed_date = new DateTime.from_iso8601 (date.get_string (), null);
+            var new_date = GUPnP.format_date_time_for_didl_lite (fixed_date);
 
             this.serialized_info.insert (Serializer.DATE, "s", new_date);
         }