Merge branch 'release' into dev

src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs

@@ -84,7 +84,7 @@ namespace Microsoft.AspNetCore.Mvc
                     request.QueryString.ToUriComponent());
 
                 // redirect to HTTPS version of page
-                filterContext.Result = new RedirectResult(newUrl, permanent: true);
+                filterContext.Result = new RedirectResult(newUrl, permanent: false);
             }
         }
     }

test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs

@@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Mvc
             Assert.NotNull(authContext.Result);
             var result = Assert.IsType<RedirectResult>(authContext.Result);
 
-            Assert.True(result.Permanent);
+            Assert.False(result.Permanent);
             Assert.Equal(expectedUrl, result.Url);
         }
 
@@ -216,4 +216,4 @@ namespace Microsoft.AspNetCore.Mvc
             return services.BuildServiceProvider();
         }
     }
-}
+}

test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs

@@ -177,7 +177,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             var response = await Client.GetAsync("Home/HttpsOnlyAction");
 
             // Assert
-            Assert.Equal(HttpStatusCode.MovedPermanently, response.StatusCode);
+            Assert.Equal(HttpStatusCode.Found, response.StatusCode);
             Assert.NotNull(response.Headers.Location);
             Assert.Equal("https://localhost/Home/HttpsOnlyAction", response.Headers.Location.ToString());
             Assert.Equal(0, response.Content.Headers.ContentLength);