summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2019-09-18 13:40:44 +0200
committerOndrej Holy <oholy@redhat.com>2019-10-10 17:45:44 +0200
commita91b93c3cc83b688f9d1a65345356edea244efc5 (patch)
treed7e4f935cae1cfa43040ded167d98d5cc4356ec0
parent13d420f2d77f40c566133dc1aac14ad39d09a541 (diff)
downloadgvfs-a91b93c3cc83b688f9d1a65345356edea244efc5.tar.gz
dav: Remove brackets from IPv6 address before use
This is follow up of commit d8556a0, which removes brackets when mounting over dav/davs schemes, however, the same fix is also needed when mounting over dav+sd/davs+sd schemes in order to prevent "Invalid URI" error.
-rw-r--r--daemon/gvfsbackenddav.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
index 3cec795d..05297548 100644
--- a/daemon/gvfsbackenddav.c
+++ b/daemon/gvfsbackenddav.c
@@ -1787,7 +1787,11 @@ dav_uri_from_dns_sd_resolver (GVfsBackendDav *dav_backend)
soup_uri_set_port (uri, port);
- soup_uri_set_host (uri, address);
+ /* IPv6 host does not include brackets in SoupURI, but GVfsDnsSdResolver host does */
+ if (gvfs_is_ipv6 (address))
+ uri->host = g_strndup (address + 1, strlen (address) - 2);
+ else
+ soup_uri_set_host (uri, address);
if (path != NULL)
soup_uri_set_path (uri, path);