comparison libgaim/upnp.c @ 15287:96abd13cc0b3

[gaim-migrate @ 18076] Christian Grothoff pointed out that our UPnP code doesn't properly handle relative URLs which are an absolute path -- fixed. committer: Tailor Script <[e-mail]>

15286:21509d8e4e70

	}

	tmp = xmlnode_get_data(controlURLNode);
	if(baseURL && !gaim_str_has_prefix(tmp, "http://") &&
	   !gaim_str_has_prefix(tmp, "HTTP://")) {
		controlURL = g_strdup_printf("%s%s", baseURL, tmp);
		g_free(tmp);
	}else{
		controlURL = tmp;
	}
	g_free(baseURL);

15287:96abd13cc0b3

	}

	tmp = xmlnode_get_data(controlURLNode);
	if(baseURL && !gaim_str_has_prefix(tmp, "http://") &&
	   !gaim_str_has_prefix(tmp, "HTTP://")) {
		/* Handle absolute paths in a relative URL.  This probably
		 * belongs in util.c. */
		if (tmp[0] == '/') {
			size_t length;
			const char *path, *start = strstr(baseURL, "://");
			start = start ? start + 3 : baseURL;
			path = strchr(start, '/');
			length = path ? path - baseURL : strlen(baseURL);
			controlURL = g_strdup_printf("%.*s%s", length, baseURL, tmp);
		} else {
			controlURL = g_strdup_printf("%s%s", baseURL, tmp);
		}
		g_free(tmp);
	}else{
		controlURL = tmp;
	}
	g_free(baseURL);