Commit c53a1503 authored by titanium007's avatar titanium007

Merge fix

parents 2202d02a 0cc53a6e
...@@ -5,7 +5,7 @@ using System.Text; ...@@ -5,7 +5,7 @@ using System.Text;
namespace Titanium.Web.Proxy.Helpers namespace Titanium.Web.Proxy.Helpers
{ {
public class CustomBinaryReader : BinaryReader internal class CustomBinaryReader : BinaryReader
{ {
internal CustomBinaryReader(Stream stream, Encoding encoding) internal CustomBinaryReader(Stream stream, Encoding encoding)
: base(stream, encoding) : base(stream, encoding)
......
...@@ -250,7 +250,7 @@ namespace Titanium.Web.Proxy ...@@ -250,7 +250,7 @@ namespace Titanium.Web.Proxy
Dispose(client, clientStream, clientStreamReader, clientStreamWriter, args); Dispose(client, clientStream, clientStreamReader, clientStreamWriter, args);
break; break;
} }
} }
if (connection != null) if (connection != null)
......
...@@ -124,9 +124,10 @@ namespace Titanium.Web.Proxy ...@@ -124,9 +124,10 @@ namespace Titanium.Web.Proxy
} }
} }
return response.Response.ResponseHeaders; return response.Response.ResponseHeaders;
} }
private static void WriteResponseStatus(Version version, string code, string description, private static void WriteResponseStatus(Version version, string code, string description,
StreamWriter responseWriter) StreamWriter responseWriter)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment