Changeset 1110

Timestamp:

2008-10-08 17:13:19 (1 month ago)

Author:

MaierMan

Message:

markAutoRetry before pause, so that the state is correctly maintained.

Files:

• trunk/chrome/content/dta/manager.js (modified) (6 diffs)

trunk/chrome/content/dta/manager.js

@@ -348 +348 @@
-                                if (d.is(RUNNING) && (Utils.getTimestamp() - d.timeLastProgress) >= Prefs.timeout * 1000) {
-                                        if (d.resumable || !d.totalSize || !d.partialSize) {
+                                                d.markAutoRetry();
-                                                d.pause();
-                                                d.markAutoRetry();
-                                                d.status = _("timeout");
-                                        }
@@ -2352 +2352 @@
-                                if ([401, 402, 407, 500, 502, 503, 504].indexOf(code) != -1) {
-                                        Debug.log("we got temp failure!", code);
+                                        d.markAutoRetry();
-                                        d.pause();
-                                        d.markAutoRetry();
-                                        d.status = code >= 500 ? _('temperror') : _('autherror');
-                                }
@@ -2504 +2504 @@
-                        if (!this.handleError()) {
-                                Debug.log(d + ": Server error or disconnection", "(type 1)");
+                                d.markAutoRetry();
-                                d.status = _("servererror");
-                                d.markAutoRetry();
-                                d.pause();
-                        }
@@ -2664 +2664 @@
-                ].indexOf(aStatusCode)) {
-                        Debug.log(d + ": Server error or disconnection", "(type 3)");
+                        d.markAutoRetry();
-                        d.pause();
-                        d.status = _("servererror");
-                        d.markAutoRetry();                              
-                        return;
-                }
@@ -2687 +2687 @@
-                        if (!d.urlManager.markBad(this.url)) {
-                                Debug.log(d + ": Server error or disconnection", "(type 2)");
+                                d.markAutoRetry();
-                                d.pause();
-                                d.status = _("servererror");
-                                d.markAutoRetry();                              
-                        }
-                        else {
@@ -2701 +2701 @@
-                if (!d.isOf(PAUSED, CANCELED, FINISHING) && d.chunks.length == 1 && d.chunks[0] == c) {
-                        if (d.resumable) {
+                                d.markAutoRetry();
-                                d.pause();
-                                d.markAutoRetry();
-                                d.status = _('errmismatchtitle');
-                        }