X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=102c7f900b90263a0339624c575f435587dc2025;hb=2c33101693b172ccc3e87725eb5a7772de6745be;hp=9042a48d5df88952e50fc81ef3f23d3863cb881c;hpb=e6ffe025033f82d752ec4966c6b12c49d8e1dc29;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 9042a48..102c7f9 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -132,12 +132,6 @@ jQuery.fn.extend({
 
 });
 
-// If IE is used, create a wrapper for the XMLHttpRequest object
-if ( !window.XMLHttpRequest )
-	XMLHttpRequest = function(){
-		return new ActiveXObject("Microsoft.XMLHTTP");
-	};
-
 // Attach a bunch of functions for handling common AJAX events
 
 /**
@@ -414,9 +408,6 @@ jQuery.extend({
 		});
 	},
 
-	// timeout (ms)
-	//timeout: 0,
-
 	/**
 	 * Set the timeout in milliseconds of all AJAX requests to a specific amount of time.
 	 * This will make all future AJAX requests timeout after a specified amount
@@ -624,8 +615,9 @@ jQuery.extend({
 
 		var requestDone = false;
 
-		// Create the request object
-		var xml = new XMLHttpRequest();
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+		var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
 
 		// Open the socket
 		xml.open(s.type, s.url, s.async);
@@ -642,10 +634,6 @@ jQuery.extend({
 		// Set header so the called script knows that it's an XMLHttpRequest
 		xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
 
-		// Make sure the browser sends the right content length
-		if ( xml.overrideMimeType )
-			xml.setRequestHeader("Connection", "close");
-			
 		// Allow custom headers/mimetypes
 		if( s.beforeSend )
 			s.beforeSend(xml);