less exceptions catching on runtime

Thorium · Nov 6, 2023 · d5ccb61 · d5ccb61
1 parent ef4ed85
commit d5ccb61
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 1.0.38 - November 1 2023
+* Less exception catching on runtime
+
 ### 1.0.37 - November 1 2023
 * Minor performance improvements
 * FSharp.Core update

diff --git a/src/Owin.Compression.Standard/AssemblyInfo.fs b/src/Owin.Compression.Standard/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Owin.Compression.Standard")>]
 [<assembly: AssemblyProductAttribute("Owin.Compression")>]
 [<assembly: AssemblyDescriptionAttribute("Compression (Deflate / GZip) module for Microsoft OWIN Selfhost filesystem pipeline.")>]
-[<assembly: AssemblyVersionAttribute("1.0.37")>]
-[<assembly: AssemblyFileVersionAttribute("1.0.37")>]
+[<assembly: AssemblyVersionAttribute("1.0.38")>]
+[<assembly: AssemblyFileVersionAttribute("1.0.38")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Owin.Compression.Standard"
     let [<Literal>] AssemblyProduct = "Owin.Compression"
     let [<Literal>] AssemblyDescription = "Compression (Deflate / GZip) module for Microsoft OWIN Selfhost filesystem pipeline."
-    let [<Literal>] AssemblyVersion = "1.0.37"
-    let [<Literal>] AssemblyFileVersion = "1.0.37"
+    let [<Literal>] AssemblyVersion = "1.0.38"
+    let [<Literal>] AssemblyFileVersion = "1.0.38"
diff --git a/src/Owin.Compression.Standard/CompressionModule.fs b/src/Owin.Compression.Standard/CompressionModule.fs
@@ -112,10 +112,12 @@ module OwinCompression =
 
         let create304Response (contextResponse:HttpResponse) =
             if not contextResponse.HasStarted then
-                contextResponse.StatusCode <- 304
+                if contextResponse.StatusCode <> 304 then
+                    contextResponse.StatusCode <- 304
                 contextResponse.Body.Close()
                 contextResponse.Body <- Stream.Null
-                contextResponse.ContentLength <- Nullable()
+                if contextResponse.ContentLength.HasValue then
+                    contextResponse.ContentLength <- Nullable()
             false
 
         let checkNoValidETag (contextRequest:HttpRequest) (contextResponse:HttpResponse) (cancellationSrc:Threading.CancellationTokenSource) (itemToCheck:Stream) =
@@ -243,7 +245,8 @@ module OwinCompression =
                                     contextResponse.Headers.["Transfer-Encoding"] <- "chunked"
                                 true
                             else
-                                contextResponse.ContentLength <- Nullable op.LongLength
+                                if (not contextResponse.ContentLength.HasValue) || (contextResponse.ContentLength.Value <> -1 && contextResponse.ContentLength.Value <> op.LongLength) then
+                                    contextResponse.ContentLength <- Nullable op.LongLength
                                 false
 
                         with | _ -> 
@@ -348,7 +351,8 @@ module OwinCompression =
                                         || contextResponse.Headers.["Transfer-Encoding"] <> StringValues("chunked") then
                                         contextResponse.Headers.["Transfer-Encoding"] <- StringValues("chunked")
                                 else
-                                    contextResponse.ContentLength <- Nullable(op.LongLength)
+                                    if (not contextResponse.ContentLength.HasValue) || (contextResponse.ContentLength.Value <> -1 && contextResponse.ContentLength.Value <> op.LongLength) then
+                                        contextResponse.ContentLength <- Nullable(op.LongLength)
                             with | _ -> () // Content length info is not so important...
 
                         use tmpOutput = new MemoryStream(op)

diff --git a/src/Owin.Compression/AssemblyInfo.fs b/src/Owin.Compression/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Owin.Compression")>]
 [<assembly: AssemblyProductAttribute("Owin.Compression")>]
 [<assembly: AssemblyDescriptionAttribute("Compression (Deflate / GZip) module for Microsoft OWIN Selfhost filesystem pipeline.")>]
-[<assembly: AssemblyVersionAttribute("1.0.37")>]
-[<assembly: AssemblyFileVersionAttribute("1.0.37")>]
+[<assembly: AssemblyVersionAttribute("1.0.38")>]
+[<assembly: AssemblyFileVersionAttribute("1.0.38")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "Owin.Compression"
     let [<Literal>] AssemblyProduct = "Owin.Compression"
     let [<Literal>] AssemblyDescription = "Compression (Deflate / GZip) module for Microsoft OWIN Selfhost filesystem pipeline."
-    let [<Literal>] AssemblyVersion = "1.0.37"
-    let [<Literal>] AssemblyFileVersion = "1.0.37"
+    let [<Literal>] AssemblyVersion = "1.0.38"
+    let [<Literal>] AssemblyFileVersion = "1.0.38"
diff --git a/src/Owin.Compression/CompressionModule.fs b/src/Owin.Compression/CompressionModule.fs
@@ -102,10 +102,12 @@ module OwinCompression =
             else ValueNone
 
         let create304Response (contextResponse:IOwinResponse) =
-            contextResponse.StatusCode <- 304
+            if contextResponse.StatusCode <> 304 then
+                contextResponse.StatusCode <- 304
             contextResponse.Body.Close()
             contextResponse.Body <- Stream.Null
-            contextResponse.ContentLength <- Nullable()
+            if contextResponse.ContentLength.HasValue then
+                contextResponse.ContentLength <- Nullable()
             false
 
         let checkNoValidETag (contextRequest:IOwinRequest) (contextResponse:IOwinResponse) (cancellationSrc:Threading.CancellationTokenSource) (itemToCheck:Stream) =
@@ -218,7 +220,8 @@ module OwinCompression =
                                     contextResponse.Headers.["Transfer-Encoding"] <- "chunked"
                                 true
                             else
-                                contextResponse.ContentLength <- Nullable op.LongLength
+                                if (not contextResponse.ContentLength.HasValue) || (contextResponse.ContentLength.Value <> -1 && contextResponse.ContentLength.Value <> op.LongLength) then
+                                    contextResponse.ContentLength <- Nullable op.LongLength
                                 false
 
                         with | _ -> 
@@ -323,7 +326,8 @@ module OwinCompression =
                                         || contextResponse.Headers.["Transfer-Encoding"] <> "chunked" then
                                         contextResponse.Headers.["Transfer-Encoding"] <- "chunked"
                                 else
-                                    contextResponse.ContentLength <- Nullable(op.LongLength)
+                                    if (not contextResponse.ContentLength.HasValue) || (contextResponse.ContentLength.Value <> -1 && contextResponse.ContentLength.Value <> op.LongLength) then
+                                        contextResponse.ContentLength <- Nullable(op.LongLength)
                             with | _ -> () // Content length info is not so important...
 
                         use tmpOutput = new MemoryStream(op)