From 2c4ef997b97fa32b1f67c12f0de24528f43792f8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 13 Jul 2013 14:12:18 +0200 Subject: [PATCH] url.c: Fix dot file path cleanup when using an HTTP proxy Previously the path was cleaned, but the URL wasn't properly updated. --- lib/url.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/url.c b/lib/url.c index cda4e4825..a8f2a0985 100644 --- a/lib/url.c +++ b/lib/url.c @@ -3899,15 +3899,20 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data, the original */ size_t urllen = strlen(data->change.url); /* original URL length */ + size_t prefixlen = strlen(conn->host.name); + + if(!*prot_missing) + prefixlen += strlen(protop) + strlen("://"); + reurl = malloc(urllen + 2); /* 2 for zerobyte + slash */ if(!reurl) return CURLE_OUT_OF_MEMORY; /* copy the prefix */ - memcpy(reurl, data->change.url, urllen - (plen-1)); + memcpy(reurl, data->change.url, prefixlen); /* append the trailing piece + zerobyte */ - memcpy(&reurl[urllen - (plen-1)], path, plen + 1); + memcpy(&reurl[prefixlen], path, plen + 1); /* possible free the old one */ if(data->change.url_alloc) {