Merge pull request #242 from lpinca/simplify/url-sanitization

Simplify the URL sanitization
sockjs · May 6, 2015 · 9bcb964 · 9bcb964
2 parents fdf37da + cd626d3
commit 9bcb964
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -92,11 +92,10 @@ function SockJS(url, protocols, options) {
   this._origin = o ? o.toLowerCase() : null;
 
   // remove the trailing slash
-  parsedUrl.path = parsedUrl.pathname.replace(/[/]+$/, '') + (parsedUrl.query || '');
+  parsedUrl.set('pathname', parsedUrl.pathname.replace(/\/+$/, ''));
 
   // store the sanitized url
-  this.url = parsedUrl.protocol + '//' + (parsedUrl.auth ? parsedUrl.auth + '@' : '') +
-    parsedUrl.hostname + (parsedUrl.port ? ':' + parsedUrl.port : '') + parsedUrl.path;
+  this.url = parsedUrl.href;
   debug('using url', this.url);
 
   // Step 7 - start connection in background