Commit 771e637a authored by Dave Methvin's avatar Dave Methvin

Fixes #10098. Avoid a slashy-starry char sequence in literal strings to evade...

Fixes #10098. Avoid a slashy-starry char sequence in literal strings to evade faulty script compressors.
parent 84f29084
...@@ -42,7 +42,10 @@ var r20 = /%20/g, ...@@ -42,7 +42,10 @@ var r20 = /%20/g,
ajaxLocation, ajaxLocation,
// Document location segments // Document location segments
ajaxLocParts; ajaxLocParts,
// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
starSlashStar = "*/".concat("*");
// #8138, IE may throw an exception when accessing // #8138, IE may throw an exception when accessing
// a field from window.location if document.domain has been set // a field from window.location if document.domain has been set
...@@ -331,7 +334,7 @@ jQuery.extend({ ...@@ -331,7 +334,7 @@ jQuery.extend({
html: "text/html", html: "text/html",
text: "text/plain", text: "text/plain",
json: "application/json, text/javascript", json: "application/json, text/javascript",
"*": "*/*" "*": starSlashStar
}, },
contents: { contents: {
...@@ -702,7 +705,7 @@ jQuery.extend({ ...@@ -702,7 +705,7 @@ jQuery.extend({
jqXHR.setRequestHeader( jqXHR.setRequestHeader(
"Accept", "Accept",
s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ? s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) : s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + starSlashStar + "; q=0.01" : "" ) :
s.accepts[ "*" ] s.accepts[ "*" ]
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment