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

chore: npm testing script

Browse Source
This commit is contained in:
Ya Zhuang 2016-05-31 14:17:57 +08:00
parent 4144beecc1
commit cc71812445
No known key found for this signature in database
GPG Key ID: B024B2767A35B0C7
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/requestHandler.js
View File

@ -233,13 +233,8 @@ function userRequestHandler(req,userRes){
resourceInfo.resHeader = resHeader; resourceInfo.resHeader = resHeader;
resourceInfo.resBody = serverResData; resourceInfo.resBody = serverResData;
resourceInfo.length = serverResData ? serverResData.length : 0; resourceInfo.length = serverResData ? serverResData.length : 0;
<<<<<<< HEAD
GLOBAL.recorder && GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
=======
global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo); global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo);
>>>>>>> 6521604... change: discard decrpecated GLOBAL
callback(); callback();
@ -378,13 +373,8 @@ function connectReqHandler(req, socket, head){
resourceInfo.resHeader = {}; resourceInfo.resHeader = {};
resourceInfo.resBody = ""; resourceInfo.resBody = "";
resourceInfo.length = 0; resourceInfo.length = 0;
<<<<<<< HEAD
GLOBAL.recorder && GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
=======
global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo); global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo);
>>>>>>> 6521604... change: discard decrpecated GLOBAL
callback(); callback();
} }

1
package.json
View File

@ -48,7 +48,6 @@
"test": "sh test/test.sh", "test": "sh test/test.sh",
"testserver": "node test/server/startServer.js" "testserver": "node test/server/startServer.js"
}, },
"optionalDependencies": {},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/alibaba/anyproxy" "url": "https://github.com/alibaba/anyproxy"