From f6ac9a3228c7287c0a76d856ddc0dd1f1ae00b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=83=B3=E5=BD=93=E5=BD=93?= <donghua.yan@alipay.com>
Date: Wed, 12 Nov 2014 14:28:20 +0800
Subject: [PATCH] add tcp-ping
---
lib/requestHandler.js | 1 +
package.json | 5 +++--
proxy.js | 7 +++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/requestHandler.js b/lib/requestHandler.js
index ff1e885..03e6640 100644
--- a/lib/requestHandler.js
+++ b/lib/requestHandler.js
@@ -274,6 +274,7 @@ function connectReqHandler(req, socket, head){
//find port
function(callback){
+
if(shouldIntercept){
//TODO : remote port other than 433
httpsServerMgrInstance.fetchPort(host,userRequestHandler,function(err,port){
diff --git a/package.json b/package.json
index 07a541e..294eb12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "anyproxy",
- "version": "2.8.4",
+ "version": "2.8.5",
"description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
"main": "proxy.js",
"bin": {
@@ -33,7 +33,8 @@
"socks5-http-client": "^0.1.6",
"socks5-https-client": "^0.2.2",
"http-proxy-agent":"^0.2.6",
- "https-proxy-agent":"^0.3.5"
+ "https-proxy-agent":"^0.3.5",
+ "tcp-ping":"^0.1.1"
},
"repository": {
"type":"git",
diff --git a/proxy.js b/proxy.js
index 4a84878..641a312 100644
--- a/proxy.js
+++ b/proxy.js
@@ -10,10 +10,9 @@ try{
GLOBAL.util['mysql'] = require('mysql');
GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent');
GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent');
- GLOBAL.util['HttpProxyAgent'] = require("http-proxy-agent");
- GLOBAL.util['HttpsProxyAgent'] = require("https-proxy-agent");
-
-
+ GLOBAL.util['HttpProxyAgent'] = require('http-proxy-agent');
+ GLOBAL.util['HttpsProxyAgent'] = require('https-proxy-agent');
+ GLOBAL.util['tcp-ping'] = require('tcp-ping');
}catch(e){}
var http = require('http'),