From 9020fea5326879b089b6fd4ffb4f8640b020d14c Mon Sep 17 00:00:00 2001
From: Douglas Christopher Wilson <doug@somethingdoug.com>
Date: Sun, 10 Aug 2014 21:03:35 -0400
Subject: [PATCH] Fix parsing original URL

---
 History.md   | 2 ++
 index.js     | 4 ++--
 package.json | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/History.md b/History.md
index c61ecc58..f0406857 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,9 @@
 unreleased
 ==========
 
+  * Fix parsing original URL
   * deps: on-headers@~1.0.0
+  * deps: parseurl@~1.3.0
 
 1.7.4 / 2014-08-05
 ==================
diff --git a/index.js b/index.js
index 2c0050b2..35ea5a84 100644
--- a/index.js
+++ b/index.js
@@ -13,10 +13,10 @@
 var cookie = require('cookie');
 var debug = require('debug')('express-session');
 var deprecate = require('depd')('express-session');
+var parseUrl = require('parseurl');
 var uid = require('uid-safe').sync
   , onHeaders = require('on-headers')
   , crc32 = require('buffer-crc32')
-  , parse = require('url').parse
   , signature = require('cookie-signature')
 
 var Session = require('./session/session')
@@ -138,7 +138,7 @@ function session(options){
     if (!storeReady) return debug('store is disconnected'), next();
 
     // pathname mismatch
-    var originalPath = parse(req.originalUrl || req.url).pathname;
+    var originalPath = parseUrl.original(req).pathname;
     if (0 != originalPath.indexOf(cookie.path || '/')) return next();
 
     // backwards compatibility for signed cookies
diff --git a/package.json b/package.json
index 6aa8aeb9..a1717d1e 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "debug": "1.0.4",
     "depd": "0.4.4",
     "on-headers": "~1.0.0",
+    "parseurl": "~1.3.0",
     "uid-safe": "1.0.1",
     "utils-merge": "1.0.0"
   },