mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix download retrying

Browse source 
Follow-up from 238a972a
This commit is contained in:
Dan Stillman 2014-06-10 03:50:41 -04:00
parent 238a972ace
commit fad6174e39
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/xpcom/storage/streamListener.js
View file

@ -192,7 +192,7 @@ Zotero.Sync.Storage.StreamListener.prototype = {
Zotero.debug('Request ended with status ' + status); Zotero.debug('Request ended with status ' + status);
var cancelled = status == 0x804b0002; // NS_BINDING_ABORTED 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); request.QueryInterface(Components.interfaces.nsIHttpChannel);
try { try {
status = request.responseStatus; status = request.responseStatus;
@ -203,6 +203,9 @@ Zotero.Sync.Storage.StreamListener.prototype = {
} }
request.QueryInterface(Components.interfaces.nsIRequest); request.QueryInterface(Components.interfaces.nsIRequest);
} }
else {
status = 0;
}
if (this._data.streams) { if (this._data.streams) {
for each(var stream in this._data.streams) { for each(var stream in this._data.streams) {

3
chrome/content/zotero/xpcom/storage/zfs.js
View file

@ -751,6 +751,8 @@ Zotero.Sync.Storage.ZFS = (function () {
throw new Error("Item '" + request.name + "' not found"); throw new Error("Item '" + request.name + "' not found");
} }
var self = this;
// Retrieve file info from server to store locally afterwards // Retrieve file info from server to store locally afterwards
return getStorageFileInfo(item, request) return getStorageFileInfo(item, request)
.then(function (info) { .then(function (info) {
@ -869,7 +871,6 @@ Zotero.Sync.Storage.ZFS = (function () {
+ " (" + libraryKey + ") -- retrying download" + " (" + libraryKey + ") -- retrying download"
Components.utils.reportError(msg); Components.utils.reportError(msg);
Zotero.debug(msg, 1); Zotero.debug(msg, 1);
Zotero.debug(response, 1);
if (_s3Backoff < _maxS3Backoff) { if (_s3Backoff < _maxS3Backoff) {
_s3Backoff *= 2; _s3Backoff *= 2;
} }