From f6b4d6521851f20d7c0ab98843068e15799e1cbb Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Tue, 4 Dec 2018 01:18:31 +0100
Subject: [PATCH] [Diagnostics] Fix Diagnostics middleware errors (#4271)

Removes setting two forbidden headers.
---
 eng/PatchConfig.props                         |  1 +
 .../src/README.MD                             |  4 +++
 .../src/Views/DatabaseErrorPage.Designer.cs   | 34 +++++++++----------
 .../src/Views/DatabaseErrorPage.cshtml        |  2 --
 4 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 src/Middleware/Diagnostics.EntityFrameworkCore/src/README.MD

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 8fb3de2790..dcda7bfa6e 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -9,6 +9,7 @@
       Microsoft.AspNetCore.Server.IISIntegration;
       Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
       Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
+      Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore;
     </PackagesInPatch>
   </PropertyGroup>
 
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/README.MD b/src/Middleware/Diagnostics.EntityFrameworkCore/src/README.MD
new file mode 100644
index 0000000000..f90d0c97ec
--- /dev/null
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/README.MD
@@ -0,0 +1,4 @@
+# How to regenerate the error page
+* Go to the Razor Generator project
+* dotnet build
+* run `dotnet .\bin\Debug\netcoreapp2.1\dotnet-razorpagegenerator.dll "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views" "<<PathToAspNetCore>>\src\Middleware\Diagnostics.EntityFrameworkCore\src\"`
\ No newline at end of file
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.Designer.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.Designer.cs
index b9a3641004..8f04077388 100644
--- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.Designer.cs
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.Designer.cs
@@ -3,12 +3,12 @@
 namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Views
 {
     #line hidden
+    using System.Threading.Tasks;
 #line 1 "DatabaseErrorPage.cshtml"
 using System;
 
 #line default
 #line hidden
-    using System.Threading.Tasks;
 #line 2 "DatabaseErrorPage.cshtml"
 using System.Linq;
 
@@ -302,50 +302,48 @@ body .titleerror {
 #line hidden
             WriteLiteral(@""", true);
                     req.setRequestHeader(""Content-type"", ""application/x-www-form-urlencoded"");
-                    req.setRequestHeader(""Content-length"", formBody.length);
-                    req.setRequestHeader(""Connection"", ""close"");
                     req.send(formBody);
                 }
 
                 function ErrorApplyingMigrations() {
                     applyMigrations.innerHTML = """);
-#line 184 "DatabaseErrorPage.cshtml"
+#line 182 "DatabaseErrorPage.cshtml"
                                             Write(JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsButton));
 
 #line default
 #line hidden
             WriteLiteral("\";\r\n                    applyMigrationsError.innerHTML = \"");
-#line 185 "DatabaseErrorPage.cshtml"
+#line 183 "DatabaseErrorPage.cshtml"
                                                  Write(JavaScriptEncode(Strings.DatabaseErrorPage_ApplyMigrationsFailed));
 
 #line default
 #line hidden
             WriteLiteral("\";\r\n                    applyMigrations.disabled = false;\r\n                }\r\n            </script>\r\n\r\n            <p>");
-#line 190 "DatabaseErrorPage.cshtml"
+#line 188 "DatabaseErrorPage.cshtml"
           Write(Strings.DatabaseErrorPage_HowToApplyFromPMC);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n            <code>");
-#line 191 "DatabaseErrorPage.cshtml"
+#line 189 "DatabaseErrorPage.cshtml"
              Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandPMC);
 
 #line default
 #line hidden
             WriteLiteral("</code>\r\n            <p>");
-#line 192 "DatabaseErrorPage.cshtml"
+#line 190 "DatabaseErrorPage.cshtml"
           Write(Strings.DatabaseErrorPage_HowToApplyFromCLI);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n            <code>");
-#line 193 "DatabaseErrorPage.cshtml"
+#line 191 "DatabaseErrorPage.cshtml"
              Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandCLI);
 
 #line default
 #line hidden
             WriteLiteral("</code>\r\n            <hr />\r\n        </div>\r\n");
-#line 196 "DatabaseErrorPage.cshtml"
+#line 194 "DatabaseErrorPage.cshtml"
     }
     else if (Model.PendingModelChanges)
     {
@@ -353,49 +351,49 @@ body .titleerror {
 #line default
 #line hidden
             WriteLiteral("        <div>\r\n            <h2>");
-#line 200 "DatabaseErrorPage.cshtml"
+#line 198 "DatabaseErrorPage.cshtml"
            Write(Strings.FormatDatabaseErrorPage_PendingChangesTitle(Model.ContextType.Name));
 
 #line default
 #line hidden
             WriteLiteral("</h2>\r\n            <p>");
-#line 201 "DatabaseErrorPage.cshtml"
+#line 199 "DatabaseErrorPage.cshtml"
           Write(Strings.DatabaseErrorPage_PendingChangesInfoPMC);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n            <code>");
-#line 202 "DatabaseErrorPage.cshtml"
+#line 200 "DatabaseErrorPage.cshtml"
              Write(Strings.DatabaseErrorPage_AddMigrationCommandPMC);
 
 #line default
 #line hidden
             WriteLiteral("</code>\r\n            <br />\r\n            <code>");
-#line 204 "DatabaseErrorPage.cshtml"
+#line 202 "DatabaseErrorPage.cshtml"
              Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandPMC);
 
 #line default
 #line hidden
             WriteLiteral("</code>\r\n            <p>");
-#line 205 "DatabaseErrorPage.cshtml"
+#line 203 "DatabaseErrorPage.cshtml"
           Write(Strings.DatabaseErrorPage_PendingChangesInfoCLI);
 
 #line default
 #line hidden
             WriteLiteral("</p>\r\n            <code>");
-#line 206 "DatabaseErrorPage.cshtml"
+#line 204 "DatabaseErrorPage.cshtml"
              Write(Strings.DatabaseErrorPage_AddMigrationCommandCLI);
 
 #line default
 #line hidden
             WriteLiteral("</code>\r\n            <br />\r\n            <code>");
-#line 208 "DatabaseErrorPage.cshtml"
+#line 206 "DatabaseErrorPage.cshtml"
              Write(Strings.DatabaseErrorPage_ApplyMigrationsCommandCLI);
 
 #line default
 #line hidden
             WriteLiteral("</code>\r\n            <hr />\r\n        </div>\r\n");
-#line 211 "DatabaseErrorPage.cshtml"
+#line 209 "DatabaseErrorPage.cshtml"
     }
 
 #line default
diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.cshtml b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.cshtml
index 70711befb1..6855ef270b 100644
--- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.cshtml
+++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Views/DatabaseErrorPage.cshtml
@@ -97,8 +97,6 @@
                     var formBody = "context=@JavaScriptEncode(UrlEncode(Model.ContextType.AssemblyQualifiedName))";
                     req.open("POST", "@JavaScriptEncode(Model.Options.MigrationsEndPointPath.Value)", true);
                     req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-                    req.setRequestHeader("Content-length", formBody.length);
-                    req.setRequestHeader("Connection", "close");
                     req.send(formBody);
                 }