Changeset 46506

Timestamp:

10/14/2019 07:54:36 PM (6 years 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:

• handlers.js (modified) (4 diffs)
• wp-plupload.js (modified) (3 diffs)

trunk/src/js/_enqueues/vendor/plupload/handlers.js

@@ -428 +428 @@
 
     // 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;
@@ -466 +466 @@
             });
 
-            if ( error.message && error.status !== 500 ) {
+            if ( error.message && error.status !== 500 && error.status !== 502  ) {
                 wpQueueError( error.message );
             } else {
@@ -506 +506 @@
         }).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;
@@ -583 +583 @@
             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;

trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js

@@ -110 +110 @@
         /**
          * 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
@@ -185 +185 @@
                 }
             }).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;
@@ -210 +210 @@
             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;