From a887112e5fd1f01f6da1e0521fe9f88695b692d2 Mon Sep 17 00:00:00 2001 From: josercadena Date: Tue, 1 Dec 2020 08:11:59 -0500 Subject: [PATCH 1/2] Added null validation in RedirectHandler --- src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs index 8d2b6a4115fe..0a2d693a0f84 100644 --- a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs +++ b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs @@ -134,11 +134,16 @@ private static void UpdateRedirectRequest( HttpContent originalContent) { var location = response.Headers.Location; - if (!location.IsAbsoluteUri) + if (location != null) { - location = new Uri( - new Uri(response.RequestMessage.RequestUri.GetLeftPart(UriPartial.Authority)), - location); + if (!location.IsAbsoluteUri) + { + location = new Uri( + new Uri(response.RequestMessage.RequestUri.GetLeftPart(UriPartial.Authority)), + location); + } + + redirect.RequestUri = location; } redirect.RequestUri = location; From db28452af77d72728187f8ad0e3924e1f57a0dbf Mon Sep 17 00:00:00 2001 From: jose Date: Wed, 2 Dec 2020 08:09:22 -0500 Subject: [PATCH 2/2] Removed unnecessary line in RedirectHandler Co-authored-by: campersau --- src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs index 0a2d693a0f84..2d4f64d43863 100644 --- a/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs +++ b/src/Mvc/Mvc.Testing/src/Handlers/RedirectHandler.cs @@ -146,7 +146,6 @@ private static void UpdateRedirectRequest( redirect.RequestUri = location; } - redirect.RequestUri = location; if (!ShouldKeepVerb(response)) { redirect.Method = HttpMethod.Get;