Fix Windows absolute path check using forward slashes

closes #3017
expressjs · Jun 1, 2016 · 2e1284b · 2e1284b
1 parent 999546d
commit 2e1284b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/History.md b/History.md
@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+  * Fix Windows absolute path check using forward slashes
   * Improve performance for `res.json`/`res.jsonp` in most cases
   * deps: accepts@~1.3.3
     - Fix including type extensions in parameters in `Accept` parsing

diff --git a/lib/utils.js b/lib/utils.js
@@ -67,7 +67,7 @@ exports.wetag = function wetag(body, encoding){
 
 exports.isAbsolute = function(path){
   if ('/' === path[0]) return true;
-  if (':' === path[1] && '\\' === path[2]) return true;
+  if (':' === path[1] && ('\\' === path[2] || '/' === path[2])) return true; // Windows device path
   if ('\\\\' === path.substring(0, 2)) return true; // Microsoft Azure absolute path
 };
 

diff --git a/test/utils.js b/test/utils.js
@@ -73,6 +73,7 @@ describe('utils.wetag(body, encoding)', function(){
 describe('utils.isAbsolute()', function(){
   it('should support windows', function(){
     assert(utils.isAbsolute('c:\\'));
+    assert(utils.isAbsolute('c:/'));
     assert(!utils.isAbsolute(':\\'));
   })