diff options
| author | isaacs <i@izs.me> | 2013-07-17 18:32:23 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-07-17 18:32:23 -0700 |
| commit | e71d9fd8342fef87a7624022da57034d591da153 (patch) | |
| tree | 65c3540c4f639d86e6d81639a918615041ec3611 /lib/url.js | |
| parent | bd5ab9c601f0fa19486195698b6cd0297199da4d (diff) | |
| parent | 48a4600c5669bb2b624bf004bbbb88a2d97ff6f8 (diff) | |
| download | android-node-v8-e71d9fd8342fef87a7624022da57034d591da153.tar.gz android-node-v8-e71d9fd8342fef87a7624022da57034d591da153.tar.bz2 android-node-v8-e71d9fd8342fef87a7624022da57034d591da153.zip | |
Merge remote-tracking branch 'ry/v0.10'
Conflicts:
doc/api/stream.markdown
lib/tls.js
Diffstat (limited to 'lib/url.js')
| -rw-r--r-- | lib/url.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/url.js b/lib/url.js index 25a54bff7a..49030268e9 100644 --- a/lib/url.js +++ b/lib/url.js @@ -317,7 +317,7 @@ Url.prototype.parse = function(url, parseQueryString, slashesDenoteHost) { this.query = {}; } if (rest) this.pathname = rest; - if (slashedProtocol[proto] && + if (slashedProtocol[lowerProto] && this.hostname && !this.pathname) { this.pathname = '/'; } |