Use parseurl to parse the URL from request

Author: dougwilson

History.md

@@ -1,6 +1,7 @@
 HEAD
 
   * Resolve relative paths at middleware setup
+  * Use parseurl to parse the URL from request
 
 1.0.3 / 2014-03-20
 ==================

index.js

@@ -10,6 +10,7 @@
  * Module dependencies.
  */
 
+var parseurl = require('parseurl');
 var resolve = require('path').resolve;
 var send = require('send');
 var url = require('url');
@@ -58,7 +59,7 @@ exports = module.exports = function(root, options){
   return function staticMiddleware(req, res, next) {
     if ('GET' != req.method && 'HEAD' != req.method) return next();
     var originalUrl = url.parse(req.originalUrl || req.url);
-    var path = parse(req).pathname;
+    var path = parseurl(req).pathname;
 
     if (path == '/' && originalUrl.pathname[originalUrl.pathname.length - 1] != '/') {
       return directory();
@@ -114,22 +115,3 @@ function escape(html) {
     .replace(/>/g, '>')
     .replace(/"/g, '"');
 };
-
-/**
- * Parse the `req` url.
- *
- * @param {ServerRequest} req
- * @return {Object}
- * @api private
- */
-
-function parse(req) {
-  var parsed = url.parse(req.url);
-
-  if (parsed.auth && !parsed.protocol && ~parsed.href.indexOf('//')) {
-    // This parses pathnames, and a strange pathname like //r@e should work
-    parsed = url.parse(req.url.replace(/@/g, '%40'));
-  }
-
-  return parsed;
-};

package.json

@@ -12,6 +12,7 @@
     "url": "https://github.com/expressjs/serve-static/issues"
   },
   "dependencies": {
+    "parseurl": "1.0.1",
     "send": "0.2.0"
   },
   "devDependencies": {