WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
Built from https://develop.svn.wordpress.org/trunk@46566


git-svn-id: http://core.svn.wordpress.org/trunk@46363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2019-10-21 22:44:03 +00:00
parent e1560cd1e0
commit 5013b45775
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/js/plupload/handlers.js
View File

@ -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 an HTTP 500 or 502 error.
// but the server responded with an HTTP 5xx 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 && error.status !== 502 ) {
if ( error.message && ( error.status < 500 || error.status >= 600 ) ) {
wpQueueError( error.message );
} else {
wpQueueError( pluploadL10n.http_error_image );
@ -504,8 +504,8 @@ jQuery( document ).ready( function( $ ) {
wpQueueError( message || pluploadL10n.http_error_image );
}
}).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;
}
@ -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 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;
}

2
wp-includes/js/plupload/handlers.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
wp-includes/js/plupload/wp-plupload.js
View File

@ -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 or 502 error.
* but the server responded with HTTP 5xx 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 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;
}
@ -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 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;
}

2
wp-includes/js/plupload/wp-plupload.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.3-RC1-46565';
$wp_version = '5.3-RC1-46566';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.