X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fxhr.js;h=1f136c343ed6e690136fee095f602a0afbacb729;hb=0c21c83e9691a08151f23a2c594568b07009f063;hp=4adf8eb2ad0ceea7fa2ddfeabbd9c4b13b0a388a;hpb=823eecab9073b43a283a2500e9e43c3a06cc2495;p=jquery.git

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 4adf8eb..1f136c3 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -1,17 +1,35 @@
 (function( jQuery ) {
 
-var // Next active xhr id
+var // #5280: next active xhr id and list of active xhrs' callbacks
 	xhrId = jQuery.now(),
-
-	// active xhrs
-	xhrs = {},
-
-	// #5280: see below
-	xhrUnloadAbortInstalled,
+	xhrCallbacks,
 
 	// XHR used to determine supports properties
 	testXHR;
 
+// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+function xhrOnUnloadAbort() {
+	jQuery( window ).unload(function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	});
+}
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject("Microsoft.XMLHTTP");
+	} catch( e ) {}
+}
+
 // Create the request object
 // (This is still attached to ajaxSettings for backward compatibility)
 jQuery.ajaxSettings.xhr = window.ActiveXObject ?
@@ -22,27 +40,13 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
 	 * we need a fallback.
 	 */
 	function() {
-		if ( !jQuery.ajaxSettings.isLocal ) {
-			try {
-				return new window.XMLHttpRequest();
-			} catch( xhrError ) {}
-		}
-
-		try {
-			return new window.ActiveXObject("Microsoft.XMLHTTP");
-		} catch( activeError ) {}
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
 	} :
 	// For all other browsers, use the standard XMLHttpRequest object
-	function() {
-		return new window.XMLHttpRequest();
-	};
+	createStandardXHR;
 
 // Test if we can create an xhr object
-try {
-	testXHR = jQuery.ajaxSettings.xhr();
-} catch( xhrCreationException ) {}
-
-//Does this browser support XHR requests?
+testXHR = jQuery.ajaxSettings.xhr();
 jQuery.support.ajax = !!testXHR;
 
 // Does this browser support crossDomain XHR requests
@@ -63,23 +67,6 @@ if ( jQuery.support.ajax ) {
 			return {
 				send: function( headers, complete ) {
 
-					// #5280: we need to abort on unload or IE will keep connections alive
-					if ( !xhrUnloadAbortInstalled ) {
-
-						xhrUnloadAbortInstalled = 1;
-
-						jQuery(window).bind( "unload", function() {
-
-							// Abort all pending requests
-							jQuery.each( xhrs, function( _, xhr ) {
-								if ( xhr.onreadystatechange ) {
-									xhr.onreadystatechange( 1 );
-								}
-							} );
-
-						} );
-					}
-
 					// Get a new xhr
 					var xhr = s.xhr(),
 						handle,
@@ -143,7 +130,7 @@ if ( jQuery.support.ajax ) {
 								// Do not keep as active anymore
 								if ( handle ) {
 									xhr.onreadystatechange = jQuery.noop;
-									delete xhrs[ handle ];
+									delete xhrCallbacks[ handle ];
 								}
 
 								// If it's an abort
@@ -153,7 +140,6 @@ if ( jQuery.support.ajax ) {
 										xhr.abort();
 									}
 								} else {
-									// Get info
 									status = xhr.status;
 									responseHeaders = xhr.getAllResponseHeaders();
 									responses = {};
@@ -179,6 +165,12 @@ if ( jQuery.support.ajax ) {
 									// IE - #1450: sometimes returns 1223 when it should be 204
 									if ( status === 1223 ) {
 										status = 204;
+									// Various - #8177: a Not Modified response was received
+									// yet no conditional request headers was provided
+									} else if ( status === 304 &&
+												!headers[ "if-modified-since" ] &&
+												!headers[ "if-none-match" ] ) {
+										status = 200;
 									// Status 0 encompasses several cases
 									} else if ( !status ) {
 										// Cross-domain
@@ -189,13 +181,14 @@ if ( jQuery.support.ajax ) {
 												// for errors, could be anything really (even a real 0)
 												status = 302;
 											}
-										// All same-domain - #8125, #8152: for local files, 0 is a success
+										// All same-domain: for local files, 0 is a success
 										} else if( s.isLocal ) {
 											status = 200;
+											// Opera: this notifies success for all requests
+											// (verified in 11.01). Patch welcome.
 										}
 										// Opera - #6060: sets status as 0 for 304
-										// and there doesn't seem to be any way to
-										// detect this case. Patch VERY welcome.
+										// Patch welcome.
 									}
 								}
 							}
@@ -217,10 +210,15 @@ if ( jQuery.support.ajax ) {
 					if ( !s.async || xhr.readyState === 4 ) {
 						callback();
 					} else {
-						// Add to list of active xhrs
+						// Create the active xhrs callbacks list if needed
+						// and attach the unload handler
+						if ( !xhrCallbacks ) {
+							xhrCallbacks = {};
+							xhrOnUnloadAbort();
+						}
+						// Add to list of active xhrs callbacks
 						handle = xhrId++;
-						xhrs[ handle ] = xhr;
-						xhr.onreadystatechange = callback;
+						xhr.onreadystatechange = xhrCallbacks[ handle ] = callback;
 					}
 				},