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

conflict resolved

Browse Source
This commit is contained in:
加里 2014-08-27 17:46:18 +08:00
commit 80c4352827
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/requestHandler.js
View File

@ -148,7 +148,7 @@ function userRequestHandler(req,userRes){
try{ try{
GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo); GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
}catch(e){} }catch(e){}
}); });
}); });
@ -253,6 +253,13 @@ function mergeCORSHeader(reqHeader,originHeader){
targetObj["access-control-allow-methods"] = "GET, POST, PUT"; targetObj["access-control-allow-methods"] = "GET, POST, PUT";
targetObj["access-control-allow-headers"] = reqHeader['access-control-request-headers'] || "-___-||"; targetObj["access-control-allow-headers"] = reqHeader['access-control-request-headers'] || "-___-||";
// Disable caching
// If the response status is 304 not modified, the data event of response will not emmit
targetObj["Transfer-Encoding"] = "chunked"
targetObj["Cache-Control"] = "no-cache, no-store, must-revalidate";
targetObj["Pragma"] = "no-cache";
targetObj["Expires"] = 0;
return targetObj; return targetObj;
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "anyproxy", "name": "anyproxy",
"version": "1.2.11", "version": "1.3.0",
"description": "a charles/fiddler like proxy written in NodeJs, which can handle HTTPS requests and CROS perfectly.", "description": "a charles/fiddler like proxy written in NodeJs, which can handle HTTPS requests and CROS perfectly.",
"main": "proxy.js", "main": "proxy.js",
"bin": { "bin": {