Fix TypeError when req.url is an empty string

fixes #495
expressjs · Aug 3, 2017 · c226301 · c226301
1 parent 62c4d15
commit c226301
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+  * Fix `TypeError` when `req.url` is an empty string
   * deps: depd@~1.1.1
    - Remove unnecessary `Buffer` loading
 

diff --git a/index.js b/index.js
@@ -191,7 +191,7 @@ function session(options) {
     }
 
     // pathname mismatch
-    var originalPath = parseUrl.original(req).pathname;
+    var originalPath = parseUrl.original(req).pathname || '/'
     if (originalPath.indexOf(cookieOptions.path || '/') !== 0) return next();
 
     // ensure a secret is available or bail

diff --git a/test/session.js b/test/session.js
@@ -164,6 +164,17 @@ describe('session()', function(){
     .expect(200, 'session created', cb)
   })
 
+  it('should handle empty req.url', function (done) {
+    function setup (req) {
+      req.url = ''
+    }
+
+    request(createServer(setup))
+    .get('/')
+    .expect(shouldSetCookie('connect.sid'))
+    .expect(200, done)
+  })
+
   it('should handle multiple res.end calls', function(done){
     var server = createServer(null, function (req, res) {
       res.setHeader('Content-Type', 'text/plain')