From 329e04206096dd126ea8ac29d6ca4d998048e304 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 14 Oct 2019 19:54:36 +0000 Subject: [PATCH] Uploads: Retry to post-process images after HTTP 500 and HTTP 502 errors. Props mikeschroder, azaozz. Fixes #47872. git-svn-id: https://develop.svn.wordpress.org/trunk@46506 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/vendor/plupload/handlers.js | 10 +++++----- src/js/_enqueues/vendor/plupload/wp-plupload.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/js/_enqueues/vendor/plupload/handlers.js b/src/js/_enqueues/vendor/plupload/handlers.js index fbf1012f9c..0e8280ba46 100644 --- a/src/js/_enqueues/vendor/plupload/handlers.js +++ b/src/js/_enqueues/vendor/plupload/handlers.js @@ -427,7 +427,7 @@ jQuery( document ).ready( function( $ ) { }); // Attempt to create image sub-sizes when an image was uploaded successfully - // but the server responded with HTTP 500 error. + // but the server responded with an HTTP 500 or 502 error. tryAgain = function( up, error ) { var file = error.file; var times; @@ -465,7 +465,7 @@ jQuery( document ).ready( function( $ ) { } }); - if ( error.message && error.status !== 500 ) { + if ( error.message && error.status !== 500 && error.status !== 502 ) { wpQueueError( error.message ); } else { wpQueueError( pluploadL10n.http_error_image ); @@ -505,7 +505,7 @@ jQuery( document ).ready( function( $ ) { } }).fail( function( jqXHR ) { // If another HTTP 500 error, try try again... - if ( jqXHR.status === 500 ) { + if ( jqXHR.status === 500 || jqXHR.status === 502 ) { tryAgain( up, error ); return; } @@ -582,8 +582,8 @@ jQuery( document ).ready( function( $ ) { var isImage = error.file && error.file.type && error.file.type.indexOf( 'image/' ) === 0; var status = error && error.status; - // If the file is an image and the error is HTTP 500 try to create sub-sizes again. - if ( status === 500 && isImage ) { + // If the file is an image and the error is HTTP 500 or 502 try to create sub-sizes again. + if ( ( status === 500 || status === 502 ) && isImage ) { tryAgain( up, error ); return; } diff --git a/src/js/_enqueues/vendor/plupload/wp-plupload.js b/src/js/_enqueues/vendor/plupload/wp-plupload.js index b42c98cf9b..b0d854e430 100644 --- a/src/js/_enqueues/vendor/plupload/wp-plupload.js +++ b/src/js/_enqueues/vendor/plupload/wp-plupload.js @@ -109,7 +109,7 @@ window.wp = window.wp || {}; /** * Attempt to create image sub-sizes when an image was uploaded successfully - * but the server responded with HTTP 500 error. + * but the server responded with HTTP 500 or 502 error. * * @since 5.3.0 * @@ -184,8 +184,8 @@ window.wp = window.wp || {}; error( message, data, file, 'no-retry' ); } }).fail( function( jqXHR ) { - // If another HTTP 500 error, try try again... - if ( jqXHR.status === 500 ) { + // If another HTTP 500 or 502 error, try try again... + if ( jqXHR.status === 500 || jqXHR.status === 502 ) { tryAgain( message, data, file ); return; } @@ -209,8 +209,8 @@ window.wp = window.wp || {}; var isImage = file.type && file.type.indexOf( 'image/' ) === 0; var status = data && data.status; - // If the file is an image and the error is HTTP 500 try to create sub-sizes again. - if ( retry !== 'no-retry' && status === 500 && isImage ) { + // If the file is an image and the error is HTTP 500 or 502 try to create sub-sizes again. + if ( retry !== 'no-retry' && isImage && ( status === 500 || status === 502 ) ) { tryAgain( message, data, file ); return; }