XiaoMo/anyproxy
1
0
Fork 0
mirror of https://github.com/alibaba/anyproxy.git synced 2025-04-23 16:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict resolved

Browse Source
This commit is contained in:
加里 2014-10-29 16:22:42 +08:00
commit 875fc34341
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "anyproxy", "name": "anyproxy",
"version": "2.7.0", "version": "2.7.1",
"description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.", "description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
"main": "proxy.js", "main": "proxy.js",
"bin": { "bin": {
@ -23,7 +23,8 @@
"socks5-http-client": "^0.1.6", "socks5-http-client": "^0.1.6",
"socks5-https-client": "^0.2.2", "socks5-https-client": "^0.2.2",
"stream-throttle": "^0.1.3", "stream-throttle": "^0.1.3",
"ws": "^0.4.32" "ws": "^0.4.32",
"cookie":"^0.1.2"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

17
proxy.js
View File

@ -1,13 +1,14 @@
//mix some modules to global.util //mix some modules to global.util
try{ try{
GLOBAL.util = require('./lib/util'); GLOBAL.util = require('./lib/util');
GLOBAL.util['iconv-lite'] = require("iconv-lite"); GLOBAL.util['iconv-lite'] = require("iconv-lite");
GLOBAL.util['colorful'] = require("colorful"); GLOBAL.util['colorful'] = require("colorful");
GLOBAL.util['path'] = require("path"); GLOBAL.util['path'] = require("path");
GLOBAL.util['jsdom'] = require('jsdom'); GLOBAL.util['jsdom'] = require('jsdom');
GLOBAL.util['jquery'] = require('jquery'); GLOBAL.util['cookie'] = require('cookie');
GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent'); GLOBAL.util['jquery'] = require('jquery');
GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent'); GLOBAL.util['Socks5ClientHttpAgent'] = require('socks5-http-client/lib/Agent');
GLOBAL.util['Socks5ClientHttpsAgent'] = require('socks5-https-client/lib/Agent');
}catch(e){} }catch(e){}
var http = require('http'), var http = require('http'),