From b90369e8cb2b6f3cc0afa34d815958ff0b605874 Mon Sep 17 00:00:00 2001 From: jaubourg Date: Wed, 2 Feb 2011 13:33:02 +0100 Subject: [PATCH] Fixes #8135. Makes sure any exception thrown by Firefox when trying to access an XMLHttpRequest property when a network error occured is caught and notified as an error. Added test/networkerror.html to test the behavior. --- src/ajax/xhr.js | 147 +++++++++++++++++++++++++++--------------------- test/networkerror.html | 101 +++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 65 deletions(-) create mode 100644 test/networkerror.html diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 47cfc6c..c0368b9 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -115,76 +115,93 @@ if ( jQuery.support.ajax ) { // Listener callback = function( _, isAbort ) { - // Was never called and is aborted or complete - if ( callback && ( isAbort || xhr.readyState === 4 ) ) { - - // Only called once - callback = 0; - - // Do not keep as active anymore - if ( handle ) { - xhr.onreadystatechange = jQuery.noop; - delete xhrs[ handle ]; - } - - // If it's an abort - if ( isAbort ) { - // Abort it manually if needed - if ( xhr.readyState !== 4 ) { - xhr.abort(); + var status, + statusText, + responseHeaders, + responses, + xml; + + // Firefox throws exceptions when accessing properties + // of an xhr when a network error occured + // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE) + try { + + // Was never called and is aborted or complete + if ( callback && ( isAbort || xhr.readyState === 4 ) ) { + + // Only called once + callback = undefined; + + // Do not keep as active anymore + if ( handle ) { + xhr.onreadystatechange = jQuery.noop; + delete xhrs[ handle ]; } - } else { - // Get info - var status = xhr.status, - statusText, - responseHeaders = xhr.getAllResponseHeaders(), - responses = {}, - xml = xhr.responseXML; - // Construct response list - if ( xml && xml.documentElement /* #4958 */ ) { - responses.xml = xml; - } - responses.text = xhr.responseText; - - // Firefox throws an exception when accessing - // statusText for faulty cross-domain requests - try { - statusText = xhr.statusText; - } catch( e ) { - // We normalize with Webkit giving an empty statusText - statusText = ""; - } + // If it's an abort + if ( isAbort ) { + // Abort it manually if needed + if ( xhr.readyState !== 4 ) { + xhr.abort(); + } + } else { + // Get info + status = xhr.status; + responseHeaders = xhr.getAllResponseHeaders(); + responses = {}; + xml = xhr.responseXML; - // Filter status for non standard behaviors - status = - // Most browsers return 0 when it should be 200 for local files - // Opera returns 0 when it should be 304 - // Webkit returns 0 for failing cross-domain no matter the real status - !status ? - // All: for local files, 0 is a success - ( location.protocol === "file:" ? 200 : ( - // Webkit, Firefox: filter out faulty cross-domain requests - !s.crossDomain || statusText ? + // Construct response list + if ( xml && xml.documentElement /* #4958 */ ) { + responses.xml = xml; + } + responses.text = xhr.responseText; + + // Firefox throws an exception when accessing + // statusText for faulty cross-domain requests + try { + statusText = xhr.statusText; + } catch( e ) { + // We normalize with Webkit giving an empty statusText + statusText = ""; + } + + // Filter status for non standard behaviors + status = + // Most browsers return 0 when it should be 200 for local files + // Opera returns 0 when it should be 304 + // Webkit returns 0 for failing cross-domain no matter the real status + !status ? + // All: for local files, 0 is a success + ( location.protocol === "file:" ? 200 : ( + // Webkit, Firefox: filter out faulty cross-domain requests + !s.crossDomain || statusText ? + ( + // Opera: filter out real aborts #6060 + responseHeaders ? + 304 : + 0 + ) : + // We assume 302 but could be anything cross-domain related + 302 + ) ) : ( - // Opera: filter out real aborts #6060 - responseHeaders ? - 304 : - 0 - ) : - // We assume 302 but could be anything cross-domain related - 302 - ) ) : - ( - // IE sometimes returns 1223 when it should be 204 (see #1450) - status == 1223 ? - 204 : - status - ); - - // Call complete - complete( status, statusText, responses, responseHeaders ); + // IE sometimes returns 1223 when it should be 204 (see #1450) + status == 1223 ? + 204 : + status + ); + } } + } catch( firefoxAccessException ) { + if ( !isAbort ) { + complete( -1, firefoxAccessException ); + } + } + + // Call complete if needed + if ( responses ) { + complete( status, statusText, responses, responseHeaders ); } }; diff --git a/test/networkerror.html b/test/networkerror.html new file mode 100644 index 0000000..b06a6ba --- /dev/null +++ b/test/networkerror.html @@ -0,0 +1,101 @@ + + + + + + jQuery Network Error Test for Firefox + + + + + + + + + + + + + + + + + + + + + + + +

+ jQuery Network Error Test for Firefox +

+
+ This is a test page for + + #8135 + + which was reported in Firefox when accessing properties + of an XMLHttpRequest object after a network error occured. +
+
Take the following steps:
+
    +
  1. + make sure you accessed this page through a web server, +
    2. +
  2. + stop the web server, +
    3. +
  3. + open the console, +
    4. +
  4. + click this + + , +
    5. +
  5. + wait for both requests to fail. +
    6. +
+
+ Test passes if you get two log lines: + +
+
+ Test fails if the browser notifies an exception. +
+ + \ No newline at end of file -- 1.7.10.4