Unverified Commit 0399f114 authored by honfika's avatar honfika Committed by GitHub

Merge pull request #793 from justcoding121/master

beta
parents 36077c95 a628c99e
This diff is collapsed.
......@@ -3311,6 +3311,19 @@ references:
isSpec: "True"
fullName: Titanium.Web.Proxy.Network.CertificateManager.CertificateStorage
nameWithType: CertificateManager.CertificateStorage
- uid: Titanium.Web.Proxy.Network.CertificateManager.CertificateValidDays
name: CertificateValidDays
href: api/Titanium.Web.Proxy.Network.CertificateManager.html#Titanium_Web_Proxy_Network_CertificateManager_CertificateValidDays
commentId: P:Titanium.Web.Proxy.Network.CertificateManager.CertificateValidDays
fullName: Titanium.Web.Proxy.Network.CertificateManager.CertificateValidDays
nameWithType: CertificateManager.CertificateValidDays
- uid: Titanium.Web.Proxy.Network.CertificateManager.CertificateValidDays*
name: CertificateValidDays
href: api/Titanium.Web.Proxy.Network.CertificateManager.html#Titanium_Web_Proxy_Network_CertificateManager_CertificateValidDays_
commentId: Overload:Titanium.Web.Proxy.Network.CertificateManager.CertificateValidDays
isSpec: "True"
fullName: Titanium.Web.Proxy.Network.CertificateManager.CertificateValidDays
nameWithType: CertificateManager.CertificateValidDays
- uid: Titanium.Web.Proxy.Network.CertificateManager.ClearRootCertificate
name: ClearRootCertificate()
href: api/Titanium.Web.Proxy.Network.CertificateManager.html#Titanium_Web_Proxy_Network_CertificateManager_ClearRootCertificate
......
......@@ -71,7 +71,7 @@ namespace Titanium.Web.Proxy
await CertificateManager.CreateServerCertificate(certName);
// Successfully managed to authenticate the client using the certificate
await sslStream.AuthenticateAsServerAsync(certificate, false, SslProtocols.Tls, false);
await sslStream.AuthenticateAsServerAsync(certificate, false, SslProtocols.Tls12, false);
// HTTPS server created - we can now decrypt the client's traffic
clientStream = new HttpClientStream(clientStream.Connection, sslStream, BufferPool, cancellationToken);
......
......@@ -29,10 +29,7 @@ namespace Titanium.Web.Proxy
await HeaderParser.ReadHeaders(serverConnection.Stream, response.Headers,
cancellationToken);
if (!args.IsTransparent)
{
await clientStream.WriteResponseAsync(response, cancellationToken);
}
await clientStream.WriteResponseAsync(response, cancellationToken);
// If user requested call back then do it
if (!args.HttpClient.Response.Locked)
......
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