Merge pull request #7 from alexyan/master

GLOBAL.util && rule_default
This commit is contained in:
想当当 2014-09-04 22:45:49 +08:00
commit f334a659c2

View File

@ -1,7 +1,8 @@
//mix some modules to global.util //mix some modules to global.util
try{ try{
GLOBAL.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");
}catch(e){} }catch(e){}
var http = require('http'), var http = require('http'),
@ -42,7 +43,7 @@ function proxyServer(option){
proxyType = /https/i.test(option.type || DEFAULT_TYPE) ? T_TYPE_HTTPS : T_TYPE_HTTP , proxyType = /https/i.test(option.type || DEFAULT_TYPE) ? T_TYPE_HTTPS : T_TYPE_HTTP ,
proxyPort = option.port || DEFAULT_PORT, proxyPort = option.port || DEFAULT_PORT,
proxyHost = option.hostname || DEFAULT_HOST, proxyHost = option.hostname || DEFAULT_HOST,
proxyRules = option.rule; proxyRules = option.rule || require('./lib/rule_default');
requestHandler.setRules(proxyRules); requestHandler.setRules(proxyRules);
self.httpProxyServer = null; self.httpProxyServer = null;