daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Close #1360 url: Allow _ in hostnames.

pull/5370/head
isaacs 2011-07-19 09:55:01 -07:00
parent 87d974bb8f
commit dcecfc5f1b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/url.js
View File

@ -46,8 +46,8 @@ var protocolPattern = /^([a-z0-9]+:)/i,
.concat(unwise).concat(autoEscape), .concat(unwise).concat(autoEscape),
nonAuthChars = ['/', '@', '?', '#'].concat(delims), nonAuthChars = ['/', '@', '?', '#'].concat(delims),
hostnameMaxLen = 255, hostnameMaxLen = 255,
hostnamePartPattern = /^[a-zA-Z0-9][a-z0-9A-Z-]{0,62}$/, hostnamePartPattern = /^[a-zA-Z0-9][a-z0-9A-Z_-]{0,62}$/,
hostnamePartStart = /^([a-zA-Z0-9][a-z0-9A-Z-]{0,62})(.*)$/, hostnamePartStart = /^([a-zA-Z0-9][a-z0-9A-Z_-]{0,62})(.*)$/,
// protocols that can allow "unsafe" and "unwise" chars. // protocols that can allow "unsafe" and "unwise" chars.
unsafeProtocol = { unsafeProtocol = {
'javascript': true, 'javascript': true,
@ -226,7 +226,7 @@ function urlParse(url, parseQueryString, slashesDenoteHost) {
var newOut = []; var newOut = [];
for (var i = 0; i < domainArray.length; ++i) { for (var i = 0; i < domainArray.length; ++i) {
var s = domainArray[i]; var s = domainArray[i];
newOut.push(s.match(/[^A-Za-z0-9-]/) ? newOut.push(s.match(/[^A-Za-z0-9_-]/) ?
'xn--' + punycode.encode(s) : s); 'xn--' + punycode.encode(s) : s);
} }
out.hostname = newOut.join('.'); out.hostname = newOut.join('.');

9
test/simple/test-url.js
View File

@ -327,8 +327,17 @@ var parseTests = {
'host': 'xn--hgi.ws', 'host': 'xn--hgi.ws',
'hostname': 'xn--hgi.ws', 'hostname': 'xn--hgi.ws',
'pathname': '/➡' 'pathname': '/➡'
},
'http://bucket_name.s3.amazonaws.com/image.jpg': {
protocol: 'http:',
slashes: true,
host: 'bucket_name.s3.amazonaws.com',
hostname: 'bucket_name.s3.amazonaws.com',
pathname: '/image.jpg',
href: 'http://bucket_name.s3.amazonaws.com/image.jpg'
} }
}; };
for (var u in parseTests) { for (var u in parseTests) {
var actual = url.parse(u), var actual = url.parse(u),
expected = parseTests[u]; expected = parseTests[u];