Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(main) rm gzipData

Browse source
This commit is contained in:
coderaiser 2014-02-11 10:05:35 -05:00
parent 148efae86c
commit 67b4417b75
1 changed files with 29 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

79
lib/server/main.js
View file

@ -287,45 +287,52 @@
* @param Data - данные
* @param pName - имя отсылаемого файла
*/
function sendResponse(pParams, pData, pNotLog) {
var p, lQuery, lGzip, lHead, data,
lRet = checkParams(pParams);
function sendResponse(params, data, notLog) {
var p, query, isGzip, head,
ret = checkParams(params);
if (lRet) {
p = pParams;
data = p.data || pData;
lGzip = isGZIP(p.request);
if (ret) {
p = params;
data = p.data || data;
isGzip = isGZIP(p.request);
lHead = generateHeaders({
head = generateHeaders({
name : p.name,
cache : p.cache,
gzip : lGzip,
query : lQuery
gzip : isGzip,
query : query
});
setHeader(lHead, p.response);
setHeader(head, p.response);
if (!pNotLog)
if (!notLog)
Util.log(data);
/* если браузер поддерживает gzip-сжатие - сжимаем данные*/
Util.ifExec(!lGzip,
function(pParams) {
var lRet = Util.checkObj(pParams, ['data']);
Util.ifExec(!isGzip,
function(params) {
var ret = Util.checkObj(params, ['data']);
if (lRet) {
p.status = pParams.status || p.status;
p.data = pParams.data;
if (ret) {
p.status = params.status || p.status;
p.data = params.data;
}
p.response.statusCode = p.status || OK;
p.response.end(p.data);
},
function(pCallBack) {
zlib.gzip (data, Util.call(gzipData, {
callback : pCallBack
}));
function(callback) {
zlib.gzip (data, function(error, data) {
if (!error)
p.data = data;
else {
p.status = FILE_NOT_FOUND;
p.data = error.toString();
}
Util.exec(callback, p);
});
});
}
}
@ -369,34 +376,6 @@
}
}
/**
* Функция получает сжатые данные
* @param pHeader - заголовок файла
* @pName
*/
function gzipData(pParams) {
var lRet = checkCallBackParams(pParams),
p = pParams;
if (lRet)
lRet = Util.checkObj(pParams.params, ['callback']);
if (lRet) {
var lCallBack = p.params.callback,
lParams = {};
if (!p.error)
lParams.data = p.data;
else {
lParams.status = FILE_NOT_FOUND;
lParams.data = p.error.toString();
}
Util.exec(lCallBack, lParams);
}
}
function checkCallBackParams(pParams) {
return Util.checkObj(pParams, ['error', 'data', 'params']);
}