Merge pull request #8 from sisk-http/0.15

fixes from 0.16
sisk-http · Oct 30, 2023 · 6348332 · 6348332
2 parents 47a2152 + d905e41
commit 6348332
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/Http/HttpRequest.cs b/src/Http/HttpRequest.cs
@@ -643,7 +643,7 @@ public object SendTo(RouterCallback otherCallback)
         /// </type>
         public HttpResponse Close()
         {
-            return new HttpResponse(HttpResponse.HTTPRESPONSE_SERVER_CLOSE);
+            return new HttpResponse(HttpResponse.HTTPRESPONSE_SERVER_REFUSE);
         }
 
         /// <summary>

diff --git a/src/Http/HttpResponse.cs b/src/Http/HttpResponse.cs
@@ -26,7 +26,8 @@ namespace Sisk.Core.Http
     public sealed class HttpResponse : CookieHelper
     {
         internal const byte HTTPRESPONSE_EMPTY = 2;
-        internal const byte HTTPRESPONSE_SERVER_CLOSE = 4;
+        internal const byte HTTPRESPONSE_SERVER_REFUSE = 4;
+        internal const byte HTTPRESPONSE_SERVER_CLOSE = 6;
         internal const byte HTTPRESPONSE_CLIENT_CLOSE = 32;
         internal const byte HTTPRESPONSE_ERROR = 8;
         internal int CalculedLength = 0;

diff --git a/src/Http/HttpServer__Core.cs b/src/Http/HttpServer__Core.cs
@@ -239,6 +239,12 @@ private void ListenerCallback(IAsyncResult result)
                 baseResponse.StatusCode = (int)response.Status;
                 goto finishSending;
             }
+            else if (response?.internalStatus == HttpResponse.HTTPRESPONSE_SERVER_REFUSE)
+            {
+                executionResult.Status = HttpServerExecutionStatus.ConnectionClosed;
+                baseResponse.Abort();
+                goto finishSending;
+            }
 
             byte[] responseBytes = response!.Content?.ReadAsByteArrayAsync().Result ?? new byte[] { };
 
@@ -306,7 +312,8 @@ private void ListenerCallback(IAsyncResult result)
             executionResult.ResponseSize = outcomingSize;
             executionResult.Response = response;
 
-            executionResult.Status = HttpServerExecutionStatus.Executed;
+            if (executionResult.Status == HttpServerExecutionStatus.NoResponse && response?.internalStatus != HttpResponse.HTTPRESPONSE_EMPTY)
+                executionResult.Status = HttpServerExecutionStatus.Executed;
 
             sw.Stop();
             baseResponse.Close();

diff --git a/src/Sisk.Core.csproj b/src/Sisk.Core.csproj
@@ -26,9 +26,9 @@
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>http-server,http,web framework,event sources,web sockets</PackageTags>
 
-		<AssemblyVersion>0.15.1.0</AssemblyVersion>
-		<FileVersion>0.15.1.0</FileVersion>
-		<Version>0.15.1.0</Version>
+		<AssemblyVersion>0.15.2.0</AssemblyVersion>
+		<FileVersion>0.15.2.0</FileVersion>
+		<Version>0.15.2.0</Version>
 
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<SignAssembly>False</SignAssembly>