X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fhtml-url.c;h=16d64cb36ae12e9c2a6c0b065aa60590f81475b9;hp=67a7c229cfb3ccd4aa27b07cfd153ad531d356a9;hb=61bb00adc0a2da373646e5cf8cef1ac980a3337f;hpb=8a0e9e765e42b9ab4fbab5a145a19f1069242858

diff --git a/src/html-url.c b/src/html-url.c
index 67a7c229..16d64cb3 100644
--- a/src/html-url.c
+++ b/src/html-url.c
@@ -335,7 +335,7 @@ handle_link (struct collect_urls_closure *closure, const char *link_uri,
 	complete_uri = xstrdup (link_uri);
     }
   else
-    complete_uri = url_concat (base, link_uri);
+    complete_uri = uri_merge (base, link_uri);
 
   DEBUGP (("%s: merge(\"%s\", \"%s\") -> %s\n",
 	   closure->document_file, base ? base : "(null)",
@@ -420,7 +420,7 @@ collect_tags_mapper (struct taginfo *tag, void *arg)
 	    if (closure->base)
 	      xfree (closure->base);
 	    if (closure->parent_base)
-	      closure->base = url_concat (closure->parent_base, newbase);
+	      closure->base = uri_merge (closure->parent_base, newbase);
 	    else
 	      closure->base = xstrdup (newbase);
 	  }