WordPress.org

Make WordPress Core

Changeset 46506


Ignore:
Timestamp:
10/14/2019 07:54:36 PM (4 weeks ago)
Author:
azaozz
Message:

Uploads: Retry to post-process images after HTTP 500 and HTTP 502 errors.

Props mikeschroder, azaozz.
Fixes #47872.

Location:
trunk/src/js/_enqueues/vendor/plupload
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/js/_enqueues/vendor/plupload/handlers.js

    r46382 r46506  
    428428
    429429    // Attempt to create image sub-sizes when an image was uploaded successfully
    430     // but the server responded with HTTP 500 error.
     430    // but the server responded with an HTTP 500 or 502 error.
    431431    tryAgain = function( up, error ) {
    432432        var file = error.file;
     
    466466            });
    467467
    468             if ( error.message && error.status !== 500 ) {
     468            if ( error.message && error.status !== 500 && error.status !== 502  ) {
    469469                wpQueueError( error.message );
    470470            } else {
     
    506506        }).fail( function( jqXHR ) {
    507507            // If another HTTP 500 error, try try again...
    508             if ( jqXHR.status === 500 ) {
     508            if ( jqXHR.status === 500 || jqXHR.status === 502 ) {
    509509                tryAgain( up, error );
    510510                return;
     
    583583            var status  = error && error.status;
    584584
    585             // If the file is an image and the error is HTTP 500 try to create sub-sizes again.
    586             if ( status === 500 && isImage ) {
     585            // If the file is an image and the error is HTTP 500 or 502 try to create sub-sizes again.
     586            if ( ( status === 500 || status === 502 ) && isImage ) {
    587587                tryAgain( up, error );
    588588                return;
  • trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js

    r46382 r46506  
    110110        /**
    111111         * Attempt to create image sub-sizes when an image was uploaded successfully
    112          * but the server responded with HTTP 500 error.
     112         * but the server responded with HTTP 500 or 502 error.
    113113         *
    114114         * @since 5.3.0
     
    185185                }
    186186            }).fail( function( jqXHR ) {
    187                 // If another HTTP 500 error, try try again...
    188                 if ( jqXHR.status === 500 ) {
     187                // If another HTTP 500 or 502 error, try try again...
     188                if ( jqXHR.status === 500 || jqXHR.status === 502 ) {
    189189                    tryAgain( message, data, file );
    190190                    return;
     
    210210            var status  = data && data.status;
    211211
    212             // If the file is an image and the error is HTTP 500 try to create sub-sizes again.
    213             if ( retry !== 'no-retry' && status === 500 && isImage ) {
     212            // If the file is an image and the error is HTTP 500 or 502 try to create sub-sizes again.
     213            if ( retry !== 'no-retry' && isImage && ( status === 500 || status === 502 ) ) {
    214214                tryAgain( message, data, file );
    215215                return;
Note: See TracChangeset for help on using the changeset viewer.