", "
" ];
@@ -5732,8 +5742,6 @@ jQuery.fn.extend({
(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
- value = value.replace(rxhtmlTag, "<$1>");
-
try {
for ( var i = 0, l = this.length; i < l; i++ ) {
// Remove element nodes and prevent memory leaks
@@ -6144,8 +6152,6 @@ jQuery.extend({
if ( !rhtml.test( elem ) ) {
elem = context.createTextNode( elem );
} else {
- // Fix "XHTML"-style tags in all browsers
- elem = elem.replace(rxhtmlTag, "<$1>");
// Trim whitespace, otherwise indexOf won't work as expected
var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
@@ -6688,7 +6694,7 @@ var r20 = /%20/g,
rnoContent = /^(?:GET|HEAD)$/,
rprotocol = /^\/\//,
rquery = /\?/,
- rscript = /", "
" ];
@@ -205,8 +207,6 @@ jQuery.fn.extend({
(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
- value = value.replace(rxhtmlTag, "<$1>");
-
try {
for ( var i = 0, l = this.length; i < l; i++ ) {
// Remove element nodes and prevent memory leaks
@@ -617,8 +617,6 @@ jQuery.extend({
if ( !rhtml.test( elem ) ) {
elem = context.createTextNode( elem );
} else {
- // Fix "XHTML"-style tags in all browsers
- elem = elem.replace(rxhtmlTag, "<$1>");
// Trim whitespace, otherwise indexOf won't work as expected
var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
diff --git a/src/support.js b/src/support.js
index 6608d91254..1d0b02a017 100644
--- a/src/support.js
+++ b/src/support.js
@@ -246,6 +246,12 @@ jQuery.support = (function() {
}
}
+ // Support: IE <=9 only
+ // IE <=9 replaces ";
+ support.option = !!div.lastChild;
+
// Null connected elements to avoid leaks in IE
testElement = fragment = select = opt = body = marginDiv = div = input = null;
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index f871da723e..7e2ca9c173 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -70,6 +70,70 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
}, 13);
});
+test( "jQuery.ajax() - do not execute js (crossOrigin) 1", 2, function() {
+
+ jQuery.ajaxSetup({ timeout: 0 });
+
+ stop();
+
+ setTimeout(function(){
+ jQuery.ajax({
+ url: url( "data/script.php?header=ecma" ),
+ crossDomain: true,
+ success: function() {
+ ok( true, "success" );
+ },
+ complete: function() {
+ ok( true, "complete" );
+ start();
+ }
+ });
+ }, 13);
+} );
+
+test( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3, function() {
+
+ jQuery.ajaxSetup({ timeout: 0 });
+
+ stop();
+
+ setTimeout(function(){
+ jQuery.ajax({
+ url: url( "data/script.php?header=ecma" ),
+ crossDomain: true,
+ dataType: "script",
+ success: function() {
+ ok( true, "success" );
+ },
+ complete: function() {
+ ok( true, "complete" );
+ start();
+ }
+ });
+ }, 13);
+} );
+
+test( "jQuery.ajax() - do not execute js (crossOrigin) 2", 2, function() {
+
+ jQuery.ajaxSetup({ timeout: 0 });
+
+ stop();
+
+ setTimeout(function(){
+ jQuery.ajax({
+ url: url( "data/script.php" ),
+ crossDomain: true,
+ success: function() {
+ ok( true, "success" );
+ },
+ complete: function() {
+ ok( true, "complete" );
+ start();
+ }
+ });
+ }, 13);
+} );
+
test("jQuery.ajax() - success callbacks (late binding)", function() {
expect( 8 );
diff --git a/test/unit/core.js b/test/unit/core.js
index fdf0ceb5ef..be7b3808bd 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,7 +12,7 @@ test("Basic requirements", function() {
});
test("jQuery()", function() {
- expect(29);
+ expect(25);
// Basic constructor's behavior
@@ -56,7 +56,7 @@ test("jQuery()", function() {
var img = jQuery("" + long + "
").length, 1, "Make sure whitespace is trimmed on long strings." );
- equals( jQuery(" a" + long + "
b ").length, 1, "Make sure whitespace and other characters are trimmed on long strings." );
});
test("selector state", function() {
@@ -580,6 +575,36 @@ test("jQuery('html', context)", function() {
equals($span.length, 1, "Verify a span created with a div context works, #1763");
});
+test("XSS via location.hash", function() {
+ expect(1);
+
+ stop();
+ jQuery._check9521 = function(x){
+ ok( x, "script called from #id-like selector with inline handler" );
+ jQuery("#check9521").remove();
+ delete jQuery._check9521;
+ };
+
+ var $eCheck9521 = jQuery( '#
").appendTo("body");
+ var div2 = jQuery( "").appendTo("body");
equals( div2.find("input").css("height"), "20px", "Height on hidden input." );
equals( div2.find("textarea").css("height"), "20px", "Height on hidden textarea." );
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 4017cf196e..f2e1f55189 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -1129,7 +1129,7 @@ var testHtml = function(valueObj) {
}
ok( pass, "Set HTML" );
- div = jQuery("").html( valueObj("") );
+ div = jQuery("
").html( valueObj("
") );
equals( div.children().length, 2, "Make sure two child nodes exist." );
equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
diff --git a/version.txt b/version.txt
index 6463e95e86..6791815070 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.6.4
\ No newline at end of file
+1.6.5-sec