Skip to content

Fix IPv6 escaping of URL #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TatuLund wants to merge 1 commit into
base: 2.2.13
Choose a base branch
from
Open

Fix IPv6 escaping of URL #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion modules/javascript/src/main/webapp/javascript/atmosphere.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3085,7 +3085,16 @@

// encodeURI and decodeURI are needed to normalize URL between IE and non-IE,
// since IE doesn't encode the href property value and return it - http://jsfiddle.net/Yq9M8/1/
return encodeURI(decodeURI(div.firstChild.href));
var ua = window.navigator.userAgent;
if(ua.indexOf('MSIE ')>0 || ua.indexOf('Trident/') > 0 || ua.indexOf('Edge/') > 0){
return atmosphere.util.fixedEncodeURI(decodeURI(div.firstChild.href));
}
return div.firstChild.href;
},

// Fix IPv6 escaping, see https://github.com/Atmosphere/atmosphere-javascript/pull/243
fixedEncodeURI: function (str) {
return encodeURI(str).replace(/%5B/g, '[').replace(/%5D/g, ']');
},

prepareURL: function (url) {
Expand Down