Changeset 46566

Timestamp:

10/21/2019 10:42:02 PM (4 years ago)

Author:

azaozz

Message:

Upload: Expand error codes to include all 5xx HTTP errors when retrying to create image sub-sizes. Some servers may be configured to set HTTP 508 or 504, or possibly other 5 errors.

Porps mikeschroder, azaozz.
Fixes #48379.

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 an HTTP 500 or 502 error.
+    // but the server responded with an HTTP 5xx error.
     tryAgain = function( up, error ) {
         var file = error.file;
@@ -466 +466 @@
             });
 
-            if ( error.message && error.status !== 500 && error.status !== 502  ) {
+            if ( error.message && ( error.status < 500 || error.status >= 600 ) ) {
                 wpQueueError( error.message );
             } else {
@@ -505 +505 @@
             }
         }).fail( function( jqXHR ) {
-            // If another HTTP 500 error, try try again...
-            if ( jqXHR.status === 500 || jqXHR.status === 502 ) {
+            // If another HTTP 5xx error, try try again...
+            if ( jqXHR.status >= 500 && jqXHR.status < 600 ) {
                 tryAgain( up, error );
                 return;
@@ -583 +583 @@
             var status  = error && error.status;
 
-            // 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 ) {
+            // If the file is an image and the error is HTTP 5xx try to create sub-sizes again.
+            if ( isImage && status >= 500 && status < 600 ) {
                 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 or 502 error.
+         * but the server responded with HTTP 5xx error.
          *
          * @since 5.3.0
@@ -185 +185 @@
                 }
             }).fail( function( jqXHR ) {
-                // If another HTTP 500 or 502 error, try try again...
-                if ( jqXHR.status === 500 || jqXHR.status === 502 ) {
+                // If another HTTP 5xx error, try try again...
+                if ( jqXHR.status >= 500 && jqXHR.status < 600 ) {
                     tryAgain( message, data, file );
                     return;
@@ -210 +210 @@
             var status  = data && data.status;
 
-            // 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 ) ) {
+            // If the file is an image and the error is HTTP 5xx try to create sub-sizes again.
+            if ( retry !== 'no-retry' && isImage && status >= 500 && status < 600 ) {
                 tryAgain( message, data, file );
                 return;