helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix exceptions not handled in DoHTTPSRequest

Browse source 
Bug report by GetPots. Thanks!
This commit is contained in:
ORelio 2016-09-24 13:48:36 +02:00
parent f5575d7f8b
commit f82cb8f83a
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -396,22 +396,35 @@ namespace MinecraftClient.Protocol
{ {
string postResult = null; string postResult = null;
int statusCode = 520; int statusCode = 520;
Exception exception = null;
AutoTimeout.Perform(() => AutoTimeout.Perform(() =>
{ {
TcpClient client = ProxyHandler.newTcpClient(host, 443, true); try
SslStream stream = new SslStream(client.GetStream());
stream.AuthenticateAsClient(host);
stream.Write(Encoding.ASCII.GetBytes(String.Join("\r\n", headers.ToArray())));
System.IO.StreamReader sr = new System.IO.StreamReader(stream);
string raw_result = sr.ReadToEnd();
if (raw_result.StartsWith("HTTP/1.1"))
{ {
postResult = raw_result.Substring(raw_result.IndexOf("\r\n\r\n") + 4); TcpClient client = ProxyHandler.newTcpClient(host, 443, true);
statusCode = Settings.str2int(raw_result.Split(' ')[1]); SslStream stream = new SslStream(client.GetStream());
stream.AuthenticateAsClient(host);
stream.Write(Encoding.ASCII.GetBytes(String.Join("\r\n", headers.ToArray())));
System.IO.StreamReader sr = new System.IO.StreamReader(stream);
string raw_result = sr.ReadToEnd();
if (raw_result.StartsWith("HTTP/1.1"))
{
postResult = raw_result.Substring(raw_result.IndexOf("\r\n\r\n") + 4);
statusCode = Settings.str2int(raw_result.Split(' ')[1]);
}
else statusCode = 520; //Web server is returning an unknown error
}
catch (Exception e)
{
if (!(e is System.Threading.ThreadAbortException))
{
exception = e;
}
} }
else statusCode = 520; //Web server is returning an unknown error
}, TimeSpan.FromSeconds(30)); }, TimeSpan.FromSeconds(30));
result = postResult; result = postResult;
if (exception != null)
throw exception;
return statusCode; return statusCode;
} }