Remove code used for HttpWebRequest

Author: justcoding121

Titanium.Web.Proxy/Helpers/NetFramework.cs

@@ -26,7 +26,6 @@ public class Request
         public string RequestHost { get; set; }
 
         public string RequestUrl { get; internal set; }
-        public string RequestHostname { get; internal set; }
 
         internal Encoding RequestEncoding { get; set; }
         internal Version RequestHttpVersion { get; set; }
@@ -95,6 +94,7 @@ public bool IsSecure
 
         public void SetConnection(TcpConnection Connection)
         {
+            Connection.LastAccess = DateTime.Now;
             ProxyClient = Connection;
         }
 

Titanium.Web.Proxy/Network/HttpWebClient.cs

@@ -36,10 +36,9 @@ internal class TcpConnectionManager
 
         public static TcpConnection GetClient(string Hostname, int port, bool IsSecure)
         {
-
+            TcpConnection cached = null;
             while (true)
             {
-                TcpConnection cached = null;
                 lock (ConnectionCache)
                 {
                     cached = ConnectionCache.FirstOrDefault(x => x.HostName == Hostname && x.port == port && x.IsSecure == IsSecure && x.TcpClient.Connected);
@@ -55,7 +54,15 @@ public static TcpConnection GetClient(string Hostname, int port, bool IsSecure)
                     break;
             }
 
-            return CreateClient(Hostname, port, IsSecure);
+            if (cached == null)
+                cached = CreateClient(Hostname, port, IsSecure);
+
+            if (ConnectionCache.Where(x => x.HostName == Hostname && x.port == port && x.IsSecure == IsSecure && x.TcpClient.Connected).Count() < 2)
+            {
+                Task.Factory.StartNew(() => ReleaseClient(CreateClient(Hostname, port, IsSecure)));
+            }
+
+            return cached;
         }
 
         private static TcpConnection CreateClient(string Hostname, int port, bool IsSecure)

Titanium.Web.Proxy/Network/TcpConnectionManager.cs

@@ -59,27 +59,7 @@ static ProxyServer()
         public static event EventHandler<SessionEventArgs> BeforeResponse;
 
         public static void Initialize()
-        {
-            ServicePointManager.Expect100Continue = false;
-            WebRequest.DefaultWebProxy = null;
-            ServicePointManager.DefaultConnectionLimit = int.MaxValue;
-            ServicePointManager.DnsRefreshTimeout = 3 * 60 * 1000; //3 minutes
-            ServicePointManager.MaxServicePointIdleTime = 3 * 60 * 1000;
-
-            //HttpWebRequest certificate validation callback
-            ServicePointManager.ServerCertificateValidationCallback =
-                delegate(object s, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
-                {
-                    if (sslPolicyErrors == SslPolicyErrors.None) return true;
-                    return false;
-                };
-
-#if NET40
-            //Fix a bug in .NET 4.0
-            NetFrameworkHelper.UrlPeriodFix();
-            //useUnsafeHeaderParsing 
-#endif
-            NetFrameworkHelper.ToggleAllowUnsafeHeaderParsing(true);
+        {         
             Task.Factory.StartNew(()=>TcpConnectionManager.ClearIdleConnections());
         }
 

Titanium.Web.Proxy/ProxyServer.cs

@@ -115,13 +115,15 @@ private static void HandleClient(TcpClient client)
         private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, Stream clientStream,
             CustomBinaryReader clientStreamReader, StreamWriter clientStreamWriter, string secureTunnelHostName)
         {
+            TcpConnection connection = null;
+            string lastRequestHostName = null;
 
             while (true)
             {
                 if (string.IsNullOrEmpty(httpCmd))
                 {
                     Dispose(client, clientStream, clientStreamReader, clientStreamWriter, null);
-                    return;
+                    break;
                 }
 
                 var args = new SessionEventArgs(BUFFER_SIZE);
@@ -156,14 +158,14 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S
                     args.ProxySession.Request.RequestHeaders = new List<HttpHeader>();
 
                     string tmpLine;
-
                     while (!string.IsNullOrEmpty(tmpLine = clientStreamReader.ReadLine()))
                     {
                         var header = tmpLine.Split(new char[] { ':' }, 2);
                         args.ProxySession.Request.RequestHeaders.Add(new HttpHeader(header[0], header[1]));
                     }
 
                     SetRequestHeaders(args.ProxySession.Request.RequestHeaders, args.ProxySession);
+
                     if (args.ProxySession.Request.UpgradeToWebSocket)
                     {
                         TcpHelper.SendRaw(clientStreamReader.BaseStream, httpCmd, args.ProxySession.Request.RequestHeaders,
@@ -179,7 +181,7 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S
                     args.Client.ClientStream = clientStream;
                     args.Client.ClientStreamReader = clientStreamReader;
                     args.Client.ClientStreamWriter = clientStreamWriter;
-                    args.ProxySession.Request.RequestHostname = args.ProxySession.Request.RequestUri.Host;
+                    args.ProxySession.Request.RequestHost = args.ProxySession.Request.RequestUri.Host;
                     args.ProxySession.Request.RequestUrl = args.ProxySession.Request.RequestUri.OriginalString;
                     args.Client.ClientPort = ((IPEndPoint)client.Client.RemoteEndPoint).Port;
                     args.Client.ClientIpAddress = ((IPEndPoint)client.Client.RemoteEndPoint).Address;
@@ -198,14 +200,19 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S
                     if (args.ProxySession.Request.CancelRequest)
                     {
                         Dispose(client, clientStream, clientStreamReader, clientStreamWriter, args);
-                        return;
+                        break;
                     }
 
 
                     //construct the web request that we are going to issue on behalf of the client.
-                    var connection = TcpConnectionManager.GetClient(args.ProxySession.Request.RequestUri.Host, args.ProxySession.Request.RequestUri.Port, args.IsHttps);
-                    args.ProxySession.SetConnection(connection);
+                    connection = connection == null ?
+                        TcpConnectionManager.GetClient(args.ProxySession.Request.RequestUri.Host, args.ProxySession.Request.RequestUri.Port, args.IsHttps)
+                        : lastRequestHostName != args.ProxySession.Request.RequestHost ? TcpConnectionManager.GetClient(args.ProxySession.Request.RequestUri.Host, args.ProxySession.Request.RequestUri.Port, args.IsHttps)
+                            : connection;
+
+                    lastRequestHostName = args.ProxySession.Request.RequestHost;
 
+                    args.ProxySession.SetConnection(connection);
                     args.ProxySession.SendRequest();
 
                     //If request was modified by user
@@ -233,8 +240,6 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S
                         Dispose(client, clientStream, clientStreamReader, clientStreamWriter, args);
                         return;
                     }
-                    else
-                        TcpConnectionManager.ReleaseClient(connection);
 
                     // read the next request 
                     httpCmd = clientStreamReader.ReadLine();
@@ -245,8 +250,11 @@ private static void HandleHttpSessionRequest(TcpClient client, string httpCmd, S
                     Dispose(client, clientStream, clientStreamReader, clientStreamWriter, args);
                     break;
                 }
+
             }
 
+            if (connection != null)
+                TcpConnectionManager.ReleaseClient(connection);
         }
 
         private static void WriteConnectResponse(StreamWriter clientStreamWriter, string httpVersion)

Titanium.Web.Proxy/RequestHandler.cs

@@ -93,7 +93,6 @@
     <Compile Include="RequestHandler.cs" />
     <Compile Include="ResponseHandler.cs" />
     <Compile Include="Helpers\CustomBinaryReader.cs" />
-    <Compile Include="Helpers\NetFramework.cs" />
     <Compile Include="Helpers\Compression.cs" />
     <Compile Include="ProxyServer.cs" />
     <Compile Include="EventArguments\SessionEventArgs.cs" />