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

diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js
index 4adf8eb..b18274c 100644
--- a/src/ajax/xhr.js
+++ b/src/ajax/xhr.js
@@ -1,5 +1,18 @@
 (function( jQuery ) {
 
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject("Microsoft.XMLHTTP");
+	} catch( e ) {}
+}
+
 var // Next active xhr id
 	xhrId = jQuery.now(),
 
@@ -22,27 +35,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
@@ -179,6 +178,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 +194,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.
 									}
 								}
 							}