diff --git a/chrome/content/zotero/xpcom/storage/streamListener.js b/chrome/content/zotero/xpcom/storage/streamListener.js index 18bcab64e..8a8e28295 100644 --- a/chrome/content/zotero/xpcom/storage/streamListener.js +++ b/chrome/content/zotero/xpcom/storage/streamListener.js @@ -192,7 +192,7 @@ Zotero.Sync.Storage.StreamListener.prototype = { Zotero.debug('Request ended with status ' + status); var cancelled = status == 0x804b0002; // NS_BINDING_ABORTED - if (!cancelled && request instanceof Components.interfaces.nsIHttpChannel) { + if (!cancelled && status == 0 && request instanceof Components.interfaces.nsIHttpChannel) { request.QueryInterface(Components.interfaces.nsIHttpChannel); try { status = request.responseStatus; @@ -203,6 +203,9 @@ Zotero.Sync.Storage.StreamListener.prototype = { } request.QueryInterface(Components.interfaces.nsIRequest); } + else { + status = 0; + } if (this._data.streams) { for each(var stream in this._data.streams) { diff --git a/chrome/content/zotero/xpcom/storage/zfs.js b/chrome/content/zotero/xpcom/storage/zfs.js index 3f4c144f6..7e3880d50 100644 --- a/chrome/content/zotero/xpcom/storage/zfs.js +++ b/chrome/content/zotero/xpcom/storage/zfs.js @@ -751,6 +751,8 @@ Zotero.Sync.Storage.ZFS = (function () { throw new Error("Item '" + request.name + "' not found"); } + var self = this; + // Retrieve file info from server to store locally afterwards return getStorageFileInfo(item, request) .then(function (info) { @@ -869,7 +871,6 @@ Zotero.Sync.Storage.ZFS = (function () { + " (" + libraryKey + ") -- retrying download" Components.utils.reportError(msg); Zotero.debug(msg, 1); - Zotero.debug(response, 1); if (_s3Backoff < _maxS3Backoff) { _s3Backoff *= 2; }