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

Feed: Merge multiple header values to avoid fatal error. 

When SimplePie parses HTTP headers, it combines multiple values for the same header into a comma-separated string. `WP_SimplePie_File` overrides the parsing, but was leaving them as an array instead.

That lead to a fatal error in PHP 8, because other parts of the codebase ended up passing an array to a function that expected a string.

Props david.binda, litemotiv, inc2734, NicolasKulka, hellofromTonya, mbabker, skithund, SergeyBiryukov, desrosj, timothyblynjacobs.
Reviewed by SergeyBiryukov, iandunn.
Merges [49803] and [49805] to the 5.6 branch.
Fixes #51056. See #51956.

Built from https://develop.svn.wordpress.org/branches/5.6@49806


git-svn-id: http://core.svn.wordpress.org/branches/5.6@49529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
iandunn 2020-12-16 14:26:06 +00:00
parent 5c765ae652
commit 27b776fd90
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wp-includes/class-wp-simplepie-file.php
View File

@ -10,6 +10,9 @@
/**
* Core class for fetching remote files and reading local files with SimplePie.
*
* This uses Core's HTTP API to make requests, which gives plugins the ability
* to hook into the process.
*
* @since 2.8.0
*
* @see SimplePie_File
@ -21,6 +24,8 @@ class WP_SimplePie_File extends SimplePie_File {
*
* @since 2.8.0
* @since 3.2.0 Updated to use a PHP5 constructor.
* @since 5.6.1 Multiple headers are concatenated into a comma-separated string, rather than remaining
* an array.
*
* @param string $url Remote file URL.
* @param int $timeout Optional. How long the connection should stay open in seconds.
@ -60,8 +65,32 @@ class WP_SimplePie_File extends SimplePie_File {
if ( is_wp_error( $res ) ) {
$this->error = 'WP HTTP Error: ' . $res->get_error_message();
$this->success = false;
} else {
$this->headers = wp_remote_retrieve_headers( $res );
$this->headers = wp_remote_retrieve_headers( $res );
/*
* SimplePie expects multiple headers to be stored as a comma-separated string, but
* `wp_remote_retrieve_headers()` returns them as an array, so they need to be
* converted.
*
* The only exception to that is the `content-type` header, which should ignore any
* previous values and only use the last one.
*
* @see SimplePie_HTTP_Parser::new_line().
*/
foreach ( $this->headers as $name => $value ) {
if ( ! is_array( $value ) ) {
continue;
}
if ( 'content-type' === $name ) {
$this->headers[ $name ] = array_pop( $value );
} else {
$this->headers[ $name ] = implode( ', ', $value );
}
}
$this->body = wp_remote_retrieve_body( $res );
$this->status_code = wp_remote_retrieve_response_code( $res );
}

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6.1-alpha-49778';
$wp_version = '5.6.1-alpha-49806';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.