glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-01-12 11:27:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when outputstream closes before response could be sent.

Browse Source 
#227
This commit is contained in:
Glax 2024-08-26 10:38:45 +02:00
parent 59547efab2
commit db73af3bdd
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Tranga/Server.cs
View File

@ -712,6 +712,10 @@ public class Server : GlobalBase
private void SendResponse(HttpStatusCode statusCode, HttpListenerResponse response, object? content = null) private void SendResponse(HttpStatusCode statusCode, HttpListenerResponse response, object? content = null)
{ {
if (response.OutputStream.CanWrite == false)
{
Log($"No response sent to request: Stream closed before response could be sent.");
}
//Log($"Response: {statusCode} {content}"); //Log($"Response: {statusCode} {content}");
response.StatusCode = (int)statusCode; response.StatusCode = (int)statusCode;
response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With"); response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With");
@ -719,22 +723,16 @@ public class Server : GlobalBase
response.AddHeader("Access-Control-Max-Age", "1728000"); response.AddHeader("Access-Control-Max-Age", "1728000");
response.AppendHeader("Access-Control-Allow-Origin", "*"); response.AppendHeader("Access-Control-Allow-Origin", "*");
try
{
if (content is not Stream) if (content is not Stream)
{ {
response.ContentType = "application/json"; response.ContentType = "application/json";
try
{
response.OutputStream.Write(content is not null response.OutputStream.Write(content is not null
? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content)) ? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content))
: Array.Empty<byte>()); : Array.Empty<byte>());
response.OutputStream.Close();
} }
catch (HttpListenerException e) else if (content is FileStream stream)
{
Log(e.ToString());
}
}
else if(content is FileStream stream)
{ {
string contentType = stream.Name.Split('.')[^1]; string contentType = stream.Name.Split('.')[^1];
switch (contentType.ToLower()) switch (contentType.ToLower())
@ -753,9 +751,15 @@ public class Server : GlobalBase
response.ContentType = "text/plain"; response.ContentType = "text/plain";
break; break;
} }
stream.CopyTo(response.OutputStream); stream.CopyTo(response.OutputStream);
response.OutputStream.Close();
stream.Close(); stream.Close();
} }
response.OutputStream.Close();
}
catch (HttpListenerException e)
{
Log(e.ToString());
}
} }
} }