From 0d61722f2f434337a9ab4982cde064778411b243 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 2 Nov 2017 13:48:37 +0100 Subject: [PATCH] Don't optimize URL encoding Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=60473 In the case when the URL doesn't contain any query elements we optimized for speed and memory by not using UrlBuilder to do the encoding work on the URL. However, it causes problems with URLs that are sent pre-encoded. Remove the optimization and rely on UrlBuilder in all cases. --- src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs b/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs index 357dc2c5556..6f50088d4b2 100644 --- a/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs +++ b/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs @@ -207,9 +207,6 @@ string EncodeUrl (Uri url) if (url == null) return String.Empty; - if (String.IsNullOrEmpty (url.Query)) - return Uri.EscapeUriString (url.ToString ()); - // UriBuilder takes care of encoding everything properly var bldr = new UriBuilder (url); if (url.IsDefaultPort)