From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 13 Jul 2013 12:12:18 +0000 (+0200)
Subject: url.c: Fix dot file path cleanup when using an HTTP proxy
X-Git-Tag: curl-7_32_0~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c4ef997b97fa32b1f67c12f0de24528f43792f8;p=curl

url.c: Fix dot file path cleanup when using an HTTP proxy

Previously the path was cleaned, but the URL wasn't properly updated.
---

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) {