From 6281248304ae224a26d457f74451c8607508031e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 10 Feb 2014 06:09:30 -0500 Subject: [PATCH] feature(main) add getPathName --- lib/server.js | 12 +++++------- lib/server/main.js | 14 +++++++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/server.js b/lib/server.js index 3d2c7a60..49979ece 100644 --- a/lib/server.js +++ b/lib/server.js @@ -167,16 +167,16 @@ lConfig = main.config, lParsedUrl = URL.parse(pReq.url), lQuery = lParsedUrl.search || '', - lPath = lParsedUrl.pathname; + path = main.getPathName(pReq); /* added supporting of Russian language in directory names */ - lPath = Querystring.unescape(lPath); + path = Querystring.unescape(path); if (!expressApp) - Util.log(pReq.method + ' ' + lPath + lQuery); + Util.log(pReq.method + ' ' + path + lQuery); data = { - name : lPath, + name : path, request : pReq, response : pRes }; @@ -237,9 +237,7 @@ dir = DIR, gzip = zlib.createGzip(), isGzip = main.isGZIP(request), - - parsedUrl = URL.parse(request.url), - path = parsedUrl.pathname, + path = main.getPathName(request), isJoin = CloudFunc.isJoinURL(path), readPipe = function() { diff --git a/lib/server/main.js b/lib/server/main.js index 808ef548..9ab96780 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -61,6 +61,7 @@ exports.generateHeaders = generateHeaders, exports.getQuery = getQuery, + exports.getPathName = getPathName, exports.isGZIP = isGZIP, exports.mainSetHeader = mainSetHeader, @@ -416,10 +417,21 @@ parsed = url.parse(req.url); query = parsed.query; } - + return query; } + function getPathName(req) { + var pathname, parsed; + + if (req) { + parsed = url.parse(req.url); + pathname = parsed.pathname; + } + + return pathname; + } + function isGZIP(pReq) { var lEnc, lGZIP; if (pReq) {