2.6.1

vbilopav · vbilopav · commit 32fb38f8d3cc · 2024-04-16T14:59:19.000+02:00
diff --git a/NpgsqlRest/MiddlewareExtension.cs b/NpgsqlRest/MiddlewareExtension.cs
@@ -879,15 +879,18 @@ await options.ValidateParametersAsync(new ParameterValidationValues(
                         context.Response.StatusCode = code;
                     }
                     if (options.ReturnNpgsqlExceptionMessage && context.Response.HasStarted is false)
-                    {
-                        await context.Response.WriteAsync(exception.Message);
-                    }
-                    if (context.Response.StatusCode != 200 || context.Response.HasStarted)
                     {
                         if (context.Response.StatusCode == 200)
                         {
                             context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
                         }
+                        if (context.Response.StatusCode != 205) // 205 forbids writing
+                        {
+                            await context.Response.WriteAsync(exception.Message);
+                        }
+                    }
+                    if (context.Response.StatusCode != 200 || context.Response.HasStarted)
+                    {
                         logger?.LogError(exception, "Error executing command: {0} mapped to endpoint: {1}", commandText, endpoint.Url);
                         await context.Response.CompleteAsync();
                         return;
diff --git a/NpgsqlRest/NpgsqlRest.csproj b/NpgsqlRest/NpgsqlRest.csproj
@@ -28,10 +28,10 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageReadmeFile>README.MD</PackageReadmeFile>
     <DocumentationFile>bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
-    <Version>2.6.0</Version>
-    <AssemblyVersion>2.6.0</AssemblyVersion>
-    <FileVersion>2.6.0</FileVersion>
-    <PackageVersion>2.6.0</PackageVersion>
+    <Version>2.6.1</Version>
+    <AssemblyVersion>2.6.1</AssemblyVersion>
+    <FileVersion>2.6.1</FileVersion>
+    <PackageVersion>2.6.1</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version [2.6.1]
+
+Don't write response body on status 205, which is forbidden.
+
 ## Version [2.6.0](https://github.com/vb-consulting/NpgsqlRest/tree/2.6.0) (2024-04-16)
 
 [Full Changelog](https://github.com/vb-consulting/NpgsqlRest/compare/2.5.0...2.6.0)

Original file line number	Diff line number	Diff line change
`@@ -879,15 +879,18 @@ await options.ValidateParametersAsync(new ParameterValidationValues(`
`879`	`879`	`context.Response.StatusCode = code;`
`880`	`880`	`}`
`881`	`881`	`if (options.ReturnNpgsqlExceptionMessage && context.Response.HasStarted is false)`
`882`		`- {`
`883`		`- await context.Response.WriteAsync(exception.Message);`
`884`		`- }`
`885`		`- if (context.Response.StatusCode != 200 \|\| context.Response.HasStarted)`
`886`	`882`	`{`
`887`	`883`	`if (context.Response.StatusCode == 200)`
`888`	`884`	`{`
`889`	`885`	`context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;`
`890`	`886`	`}`
	`887`	`+ if (context.Response.StatusCode != 205) // 205 forbids writing`
	`888`	`+ {`
	`889`	`+ await context.Response.WriteAsync(exception.Message);`
	`890`	`+ }`
	`891`	`+ }`
	`892`	`+ if (context.Response.StatusCode != 200 \|\| context.Response.HasStarted)`
	`893`	`+ {`
`891`	`894`	`logger?.LogError(exception, "Error executing command: {0} mapped to endpoint: {1}", commandText, endpoint.Url);`
`892`	`895`	`await context.Response.CompleteAsync();`
`893`	`896`	`return;`