Skip to content
Snippets Groups Projects
Commit 8340f246 authored by ale's avatar ale
Browse files

Update anonymize-update patch for WP 6

parent 141c832f
No related branches found
No related tags found
1 merge request!144Update dependency johnpbloch/wordpress to v6
Combines old patches to update.php --- wp-includes/update.php 2022-05-24 20:10:11.000000000 +0100
* 0101-Do-not-leak-how-many-users-blogs-there-are-to-api.wo.patch +++ wp-includes/update.php 2022-05-27 07:54:42.729857342 +0100
* 0102-anonymize-user-agent-and-don-t-send-some-headers-whe.patch @@ -91,12 +91,12 @@
* 0153-do-not-use-fake-wordpress-version.patch
--- wp-includes/update.php 2021-02-21 19:16:27.926182327 -0800
+++ wp-includes/update.php 2021-02-21 19:10:04.860633838 -0800
@@ -93,15 +93,15 @@
}
$query = array( $query = array(
- 'version' => $wp_version, 'version' => $wp_version,
- 'php' => $php_version, - 'php' => $php_version,
- 'locale' => $locale, - 'locale' => $locale,
- 'mysql' => $mysql_version, - 'mysql' => $mysql_version,
- 'local_package' => isset( $wp_local_package ) ? $wp_local_package : '', + 'php' => 'N/A',
+ 'locale' => 'C',
+ 'mysql' => 'N/A',
'local_package' => isset( $wp_local_package ) ? $wp_local_package : '',
- 'blogs' => $num_blogs, - 'blogs' => $num_blogs,
- 'users' => $user_count, - 'users' => get_user_count(),
- 'multisite_enabled' => $multisite_enabled, + 'blogs' => 31337,
- 'initial_db_version' => get_site_option( 'initial_db_version' ), + 'users' => 31337,
+ 'version' => $wp_version, 'multisite_enabled' => $multisite_enabled,
+ 'php' => 'N/A', 'initial_db_version' => get_site_option( 'initial_db_version' ),
+ 'locale' => 'C',
+ 'mysql' => 'N/A',
+ 'local_package' => isset( $wp_local_package ) ? $wp_local_package : '',
+ 'blogs' => 31337,
+ 'users' => 31337,
+ 'multisite_enabled' => 0,
+ 'initial_db_version' => 31337
); );
@@ -152,11 +152,7 @@
/**
@@ -152,13 +152,9 @@
$doing_cron = wp_doing_cron();
$options = array( $options = array(
- 'timeout' => $doing_cron ? 30 : 3, 'timeout' => $doing_cron ? 30 : 3,
- 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ), - 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
- 'headers' => array( - 'headers' => array(
- 'wp_install' => $wp_install, - 'wp_install' => $wp_install,
- 'wp_blog' => home_url( '/' ), - 'wp_blog' => home_url( '/' ),
- ), - ),
- 'body' => $post_body, + 'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org',
+ 'timeout' => $doing_cron ? 30 : 3, 'body' => $post_body,
+ 'user-agent' => 'WordPress/' . $wp_version . '; http://wordpress.org',
+ 'body' => $post_body,
); );
$response = wp_remote_post( $url, $options ); @@ -383,7 +379,7 @@
@@ -381,7 +377,7 @@
'locale' => wp_json_encode( $locales ), 'locale' => wp_json_encode( $locales ),
'all' => wp_json_encode( true ), 'all' => wp_json_encode( true ),
), ),
- 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ), - 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+ 'user-agent' => 'WordPress/' . $wp_version . '; http://wordpress.org' + 'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org',
); );
if ( $extra_stats ) { if ( $extra_stats ) {
@@ -585,7 +581,7 @@ @@ -663,7 +659,7 @@
'translations' => wp_json_encode( $translations ), 'translations' => wp_json_encode( $translations ),
'locale' => wp_json_encode( $locales ), 'locale' => wp_json_encode( $locales ),
), ),
- 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ), - 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+ 'user-agent' => 'WordPress/' . $wp_version . '; http://wordpress.org' + 'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org',
); );
if ( $extra_stats ) { if ( $extra_stats ) {
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment