From 83d6113263743be07d3ff410e9bc320abbaef308 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 26 Nov 2013 11:07:08 +0000 Subject: [PATCH] refactor(main) add mainSetHeader --- lib/server/main.js | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/lib/server/main.js b/lib/server/main.js index a2413eee..f24e1245 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -222,6 +222,26 @@ return lRet; } + function mainSetHeader(pParams) { + var p, header, lGzip, + lRet = checkParams(pParams); + + if (lRet) { + p = pParams; + lGzip = isGZIP(p.request) && p.gzip; + + header = generateHeaders({ + name : p.name, + cache : p.cache, + gzip : lGzip, + query : getQuery(p.request) + }); + + setHeader(header, p.response); + p.response.statusCode = p.status || OK; + } + } + /** * send file to client thru pipe * and gzip it if client support @@ -236,20 +256,12 @@ var p = pParams, lGzip = isGZIP(p.request) && p.gzip; - header = generateHeaders({ - name : p.name, - cache : p.cache, - gzip : lGzip, - query : getQuery(p.request) - }); - - setHeader(header, p.response); - p.response.statusCode = p.status || OK; + mainSetHeader(pParams); pipe.create({ from : p.name, write : p.response, - zip : lGzip && !p.gziped, + zip : lGzip, callback: function(error) { if (error) sendError(pParams, error); @@ -273,9 +285,8 @@ if (lRet) { p = pParams; + pParams.zip = true; data = p.data || pData; - lQuery = getQuery(p.request); - /* download, json */ lGzip = isGZIP(p.request); lHead = generateHeaders({ name : p.name,