jenkins-bot has submitted this change and it was merged.
Change subject: mw.FormDataTransport: Don't attempt to retry aborted uploads
......................................................................
mw.FormDataTransport: Don't attempt to retry aborted uploads
Turns out that the fix from b3babfce9698cefc71bb144a504b1dcef84918dc
just exposed another problem. Attempting to retry would fail (since we
check elsewhere that the upload is aborted) and throw another
exception.
Bug: T136236
Change-Id: I25177e63dfafc4b9a7524873306d8599bb9a6952
---
M resources/transports/mw.FormDataTransport.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/transports/mw.FormDataTransport.js
b/resources/transports/mw.FormDataTransport.js
index da9edaf..a19cada 100644
--- a/resources/transports/mw.FormDataTransport.js
+++ b/resources/transports/mw.FormDataTransport.js
@@ -265,6 +265,8 @@
if ( this.tooManyRetries() ) {
mw.log.warn( 'Max retries exceeded ' + contextMsg );
return $.Deferred().reject( response );
+ } else if ( this.aborted ) {
+ return $.Deferred().reject( response );
} else {
mw.log( 'Retry #' + this.retries + ' ' + contextMsg );
return this.retryWithMethod( retryMethod, file, offset
);
--
To view, visit https://gerrit.wikimedia.org/r/292330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25177e63dfafc4b9a7524873306d8599bb9a6952
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
