Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-07 15:12:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

disable debug output, handle aborted error as a non-error, handle cases where we have a null channel (bugs 135527, 126258, 135771) r=cmanske, akkana; sr=kin

Browse Source
This commit is contained in:
brade%netscape.com 2002-04-11 13:27:00 +00:00
parent 69e288aec4
commit f35b38070c
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/ui/composer/content/ComposerCommands.js
View File

@ -822,15 +822,16 @@ function GetPromptService()
return promptService;
}
const gShowDebugOutputStateChange = true;
const gShowDebugOutputStateChange = false;
const gShowDebugOutputProgress = false;
const gShowDebugOutputStatusChange = true;
const gShowDebugOutputStatusChange = false;
const gShowDebugOutputLocationChange = false;
const gShowDebugOutputSecurityChange = false;
const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener;
const nsIChannel = Components.interfaces.nsIChannel
const nsIChannel = Components.interfaces.nsIChannel;
var gEditorOutputProgressListener =
{
onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
@ -883,16 +884,26 @@ var gEditorOutputProgressListener =
}
// Detect end of file upload of any file:
if ((aStateFlags & nsIWebProgressListener.STATE_STOP) && requestSpec)
if ((aStateFlags & nsIWebProgressListener.STATE_STOP))
{
// New: Stop at the first bad aStatus, rather than waiting for STATE_IS_NETWORK message
// ignore aStatus == kErrorBindingAborted; check http response for possible errors
try {
// check http channel for response: 200 range is ok; other ranges are not
var httpChannel = aRequest.QueryInterface(Components.interfaces.nsIHttpChannel);
var httpResponse = httpChannel.responseStatus;
if (httpResponse < 200 || httpResponse >= 300)
aStatus = httpResponse; // not a real error but enough to pass check below
} catch(e) {}
else if (aStatus == kErrorBindingAborted)
aStatus = 0;
if (gShowDebugOutputStateChange)
dump("http response is: "+httpResponse+"\n");
}
catch(e)
{
if (aStatus == kErrorBindingAborted)
aStatus = 0;
}
// Notify progress dialog when we receive the STOP
// notification for a file if there was an error
@ -911,6 +922,7 @@ var gEditorOutputProgressListener =
{
// Cancel the publish
gPersistObj.cancelSave();
gProgressDialog.SetProgressStatusCancel();
//XXX TODO: we should provide more meaningful errors (if possible)
var failedStr = GetString("PublishFailed");
@ -1257,9 +1269,16 @@ function PromptUsernameAndPassword(dlgTitle, text, savePW, userObj, pwObj)
return ret;
}
const kErrorBindingAborted = 2152398850;
const kErrorBindingRedirected = 2152398851;
function DumpDebugStatus(aStatus)
{
if (aStatus == 2152398852)
if (aStatus == kErrorBindingAborted)
dump("***** status is NS_BINDING_ABORTED\n");
else if (aStatus == kErrorBindingRedirected)
dump("***** status is NS_BINDING_REDIRECTED\n");
else if (aStatus == 2152398852)
dump("***** status is UNKNOWN_TYPE\n");
else if (aStatus == 2152398853)
dump("***** status is DESTINATION_NOT_DIR\n");
@ -1565,6 +1584,7 @@ function CancelPublishing()
{
try {
gPersistObj.cancelSave(); // Cancel all networking transactions
gProgressDialog.SetProgressStatusCancel();
} catch (e) {}
// If canceling publishing do not do any commands after this