From 648162afd4c03df29f8b4055dda253598dcea756 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 7 Feb 2013 11:19:11 -0500
Subject: [PATCH] fixed bug with download from menu

---
 lib/server/commander.js | 14 ++------------
 lib/server/main.js      | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/server/commander.js b/lib/server/commander.js
index 40c04394..41ef16cc 100644
--- a/lib/server/commander.js
+++ b/lib/server/commander.js
@@ -314,7 +314,7 @@
             var p = pParams;
             
             var lPath       = p.name || getCleanPath(p.request),
-                lQuery      = getQuery(p.request),
+                lQuery      = main.getQuery(p.request),
                 /* download, json */
                 lGzip       = isGZIP(p.request),
                 lHead       = main.generateHeaders(lPath, lGzip, lQuery);
@@ -373,16 +373,6 @@
         }
     }
     
-    function getQuery(pReq){
-        var lQuery, lParsedUrl;
-        
-        if(pReq){
-            lParsedUrl  = url.parse(pReq.url);
-            lQuery      = lParsedUrl.query;
-        }
-        
-        return lQuery;
-    }
     
     function getPath(pReq){
         var lParsedUrl  = url.parse(pReq.url),
@@ -416,7 +406,7 @@
             lPath = getPath(pReq);
             
             lNoJS = Util.isContainStr(lPath, NO_JS)
-                || lPath === '/' || getQuery() == 'json';
+                || lPath === '/' || main.getQuery() == 'json';
         }
         
         return lNoJS;
diff --git a/lib/server/main.js b/lib/server/main.js
index f385596d..24ea68f1 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -10,7 +10,7 @@
         SLASH,
         ISWIN32,
         ext,
-        path, fs, zlib,
+        path, fs, zlib, url,
         
         OK              = 200,
         FILE_NOT_FOUND  = 404;
@@ -22,7 +22,7 @@
     exports.http                        = require('http'),
     exports.https                       = require('https'),
     exports.path        = path          = require('path'),
-    exports.url                         = require('url'),
+    exports.url         = url           = require('url'),
     exports.querystring                 = require('querystring'),
     
     /* Constants */
@@ -42,6 +42,7 @@
     exports.srvrequire                  = srvrequire,
     exports.rootrequire                 = rootrequire,
     exports.generateHeaders             = generateHeaders,
+    exports.getQuery                    = getQuery,
     exports.sendFile                    = sendFile,
     
     /* compitability with old versions of node */
@@ -186,12 +187,13 @@
      */
     function sendFile(pParams){
         var lRet,
-            lName, lReq, lRes;
+            lName, lReq, lRes, lQuery;
         
         if(pParams){
             lName   = pParams.name,
             lReq    = pParams.request,
             lRes    = pParams.response;
+            lQuery  = getQuery(lReq);
         }
         
         if(lName && lRes && lReq){
@@ -207,7 +209,7 @@
                 lRes.end(String(pError));
             });
             
-            lRes.writeHead(OK, generateHeaders(lName, lGzip) );
+            lRes.writeHead(OK, generateHeaders(lName, lGzip, lQuery ) );
             
             if (lGzip)
                 lReadStream = lReadStream.pipe( zlib.createGzip() );
@@ -220,5 +222,15 @@
         return lRet;
     }
     
+    function getQuery(pReq){
+        var lQuery, lParsedUrl;
+        
+        if(pReq){
+            lParsedUrl  = url.parse(pReq.url);
+            lQuery      = lParsedUrl.query;
+        }
+        
+        return lQuery;
+    }
     
 })();