Merge remote-tracking branch 'origin/master'

This commit is contained in:
加里 2014-11-17 11:06:54 +08:00
commit 1bdd03e2d0
2 changed files with 8 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{
"name": "anyproxy",
"version": "2.8.10",
"version": "2.8.11",
"description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
"main": "proxy.js",
"bin": {
@ -35,10 +35,11 @@
"jsdom": "^1.0.3",
"socks5-http-client": "^0.1.6",
"socks5-https-client": "^0.2.2",
"http-proxy-agent": "^0.2.6",
"https-proxy-agent": "^0.3.5",
"tcp-ping": "^0.1.1",
"request": "^2.48.0"
"http-proxy-agent":"^0.2.6",
"https-proxy-agent":"^0.3.5",
"tcp-ping":"^0.1.1",
"request":"^2.48.0",
"moment":"^2.8.3"
},
"repository": {
"type": "git",

View File

@ -15,6 +15,8 @@ try{
GLOBAL.util['tcp-ping'] = require('tcp-ping');
GLOBAL.util['request'] = require('request');
GLOBAL.util['async'] = require('async');
GLOBAL.util['underscore'] = require('underscore');
GLOBAL.util['moment'] = require('moment');
}catch(e){}
var http = require('http'),