同步验证的超时时间参数

Author: xljiulang

WebApiClient/Internal/SocketExtend.cs

@@ -16,7 +16,7 @@ static class SocketExtend
         /// </summary>
         /// <param name="socket">socket</param>
         /// <param name="remoteEndPoint">远程终结点</param>
-        /// <param name="timeout">超时时间</param>
+        /// <param name="timeout">连接的超时时间</param>
         /// <exception cref="SocketException"></exception>
         /// <exception cref="ArgumentNullException"></exception>
         /// <exception cref="TimeoutException"></exception>
@@ -68,7 +68,7 @@ private static void ConnectCompleted(object sender, SocketAsyncEventArgs e)
         /// </summary>
         /// <param name="socket"></param>
         /// <param name="arraySegment">缓冲区</param>
-        /// <param name="timeout">超时时间</param>
+        /// <param name="timeout">等待数据的超时时间</param>
         /// <exception cref="SocketException"></exception>
         /// <exception cref="TimeoutException"></exception>
         /// <returns></returns>

WebApiClient/ProxyValidator.cs

@@ -33,24 +33,25 @@ public ProxyValidator(IWebProxy proxy)
         /// 使用http tunnel检测代理状态
         /// </summary>
         /// <param name="targetAddress">目标地址</param>
+        /// <param name="timeout">发送或等待数据的超时时间</param>
         /// <exception cref="ArgumentNullException"></exception>
         /// <returns></returns>
-        public HttpStatusCode Validate(Uri targetAddress)
+        public HttpStatusCode Validate(Uri targetAddress, TimeSpan timeout)
         {
             if (targetAddress == null)
             {
                 throw new ArgumentNullException(nameof(targetAddress));
             }
 
             var proxyInfo = ProxyInfo.FromWebProxy(this.proxy, targetAddress);
-            return ProxyValidator.Validate(proxyInfo, targetAddress);
+            return ProxyValidator.Validate(proxyInfo, targetAddress, timeout);
         }
 
         /// <summary>
         /// 使用http tunnel检测代理状态
         /// </summary>
         /// <param name="targetAddress">目标地址</param>
-        /// <param name="timeout">超时时间</param>
+        /// <param name="timeout">连接或等待数据的超时时间</param>
         /// <exception cref="ArgumentNullException"></exception>
         /// <returns></returns>
         public Task<HttpStatusCode> ValidateAsync(Uri targetAddress, TimeSpan timeout)
@@ -69,9 +70,10 @@ public Task<HttpStatusCode> ValidateAsync(Uri targetAddress, TimeSpan timeout)
         /// </summary>
         /// <param name="proxyInfo">代理服务器信息</param>      
         /// <param name="targetAddress">目标url地址</param>
+        /// <param name="timeout">发送或等待数据的超时时间</param>
         /// <exception cref="ArgumentNullException"></exception>    
         /// <returns></returns>
-        public static HttpStatusCode Validate(ProxyInfo proxyInfo, Uri targetAddress)
+        public static HttpStatusCode Validate(ProxyInfo proxyInfo, Uri targetAddress, TimeSpan timeout)
         {
             if (proxyInfo == null)
             {
@@ -83,8 +85,8 @@ public static HttpStatusCode Validate(ProxyInfo proxyInfo, Uri targetAddress)
 
             try
             {
-                socket.SendTimeout = 3 * 1000;
-                socket.ReceiveTimeout = 5 * 1000;
+                socket.SendTimeout = (int)timeout.TotalMilliseconds;
+                socket.ReceiveTimeout = (int)timeout.TotalMilliseconds;
                 socket.Connect(remoteEndPoint);
 
                 var request = proxyInfo.ToHttpTunnelRequestString(targetAddress);
@@ -114,7 +116,7 @@ public static HttpStatusCode Validate(ProxyInfo proxyInfo, Uri targetAddress)
         /// </summary>
         /// <param name="proxyInfo">代理服务器信息</param>      
         /// <param name="targetAddress">目标url地址</param>
-        /// <param name="timeout">超时时间</param>
+        /// <param name="timeout">连接或等待数据的超时时间</param>
         /// <exception cref="ArgumentNullException"></exception>    
         /// <returns></returns>
         public static async Task<HttpStatusCode> ValidateAsync(ProxyInfo proxyInfo, Uri targetAddress, TimeSpan timeout)