fix (#461)

src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs

@@ -40,6 +40,11 @@ namespace WireMock.Admin.Requests
         /// </summary>
         public string AbsoluteUrl { get; set; }
 
+        /// <summary>
+        /// The ProxyUrl (if a proxy is used).
+        /// </summary>
+        public string ProxyUrl { get; set; }
+
         /// <summary>
         /// The query.
         /// </summary>

src/WireMock.Net/RequestMessage.cs

@@ -32,6 +32,11 @@ namespace WireMock
         /// </summary>
         public string AbsoluteUrl { get; }
 
+        /// <summary>
+        /// The ProxyUrl (if a proxy is used).
+        /// </summary>
+        public string ProxyUrl { get; set; }
+
         /// <summary>
         /// Gets the DateTime.
         /// </summary>

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -343,14 +343,22 @@ namespace WireMock.ResponseBuilders
 
             if (ProxyUrl != null && _httpClientForProxy != null)
             {
+                string RemoveFirstOccurrence(string source, string find)
+                {
+                    int place = source.IndexOf(find, StringComparison.OrdinalIgnoreCase);
+                    return place >= 0 ? source.Remove(place, find.Length) : source;
+                }
+
                 var requestUri = new Uri(requestMessage.Url);
-                var proxyUri = new Uri(ProxyUrl);
-                var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
+
+                // Build the proxy url and skip duplicates
+                string extra = RemoveFirstOccurrence(requestUri.LocalPath.TrimEnd('/'), new Uri(ProxyUrl).LocalPath.TrimEnd('/'));
+                requestMessage.ProxyUrl = ProxyUrl + extra + requestUri.Query;
 
                 return await HttpClientHelper.SendAsync(
-                    _httpClientForProxy, 
+                    _httpClientForProxy,
                     requestMessage,
-                    proxyUriWithRequestPathAndQuery.AbsoluteUri,
+                    requestMessage.ProxyUrl,
                     !settings.DisableJsonBodyParsing.GetValueOrDefault(false),
                     !settings.DisableRequestBodyDecompressing.GetValueOrDefault(false)
                 );

src/WireMock.Net/Serialization/LogEntryMapper.cs

@@ -20,6 +20,7 @@ namespace WireMock.Serialization
                 AbsolutePath = logEntry.RequestMessage.AbsolutePath,
                 Url = logEntry.RequestMessage.Url,
                 AbsoluteUrl = logEntry.RequestMessage.AbsoluteUrl,
+                ProxyUrl = logEntry.RequestMessage.ProxyUrl,
                 Query = logEntry.RequestMessage.Query,
                 Method = logEntry.RequestMessage.Method,
                 Headers = logEntry.RequestMessage.Headers,