conflict resolved

This commit is contained in:
加里
2014-08-27 17:46:18 +08:00
2 changed files with 9 additions and 2 deletions

View File

@@ -148,7 +148,7 @@ function userRequestHandler(req,userRes){
try{
GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
}catch(e){}
});
});
@@ -253,6 +253,13 @@ function mergeCORSHeader(reqHeader,originHeader){
targetObj["access-control-allow-methods"] = "GET, POST, PUT";
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;
}