diff --git a/patches/core/anonymize-update.php.patch b/patches/core/anonymize-update.php.patch index abbea6ff5e0776cfffd6302ec48edfe821067187..27058a40b0b056567dd7a57a37df8f60d4fa6935 100644 --- a/patches/core/anonymize-update.php.patch +++ b/patches/core/anonymize-update.php.patch @@ -1,67 +1,51 @@ -Combines old patches to update.php -* 0101-Do-not-leak-how-many-users-blogs-there-are-to-api.wo.patch -* 0102-anonymize-user-agent-and-don-t-send-some-headers-whe.patch -* 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 @@ - } +--- wp-includes/update.php 2022-05-24 20:10:11.000000000 +0100 ++++ wp-includes/update.php 2022-05-27 07:54:42.729857342 +0100 +@@ -91,12 +91,12 @@ $query = array( -- 'version' => $wp_version, + 'version' => $wp_version, - 'php' => $php_version, - 'locale' => $locale, - '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, -- 'users' => $user_count, -- 'multisite_enabled' => $multisite_enabled, -- 'initial_db_version' => get_site_option( 'initial_db_version' ), -+ 'version' => $wp_version, -+ 'php' => 'N/A', -+ '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 +- 'users' => get_user_count(), ++ 'blogs' => 31337, ++ 'users' => 31337, + 'multisite_enabled' => $multisite_enabled, + 'initial_db_version' => get_site_option( 'initial_db_version' ), ); - - /** -@@ -152,13 +152,9 @@ - $doing_cron = wp_doing_cron(); +@@ -152,11 +152,7 @@ $options = array( -- 'timeout' => $doing_cron ? 30 : 3, + 'timeout' => $doing_cron ? 30 : 3, - 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ), - 'headers' => array( - 'wp_install' => $wp_install, - 'wp_blog' => home_url( '/' ), - ), -- 'body' => $post_body, -+ 'timeout' => $doing_cron ? 30 : 3, -+ 'user-agent' => 'WordPress/' . $wp_version . '; http://wordpress.org', -+ 'body' => $post_body, ++ 'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org', + 'body' => $post_body, ); - $response = wp_remote_post( $url, $options ); -@@ -381,7 +377,7 @@ +@@ -383,7 +379,7 @@ 'locale' => wp_json_encode( $locales ), 'all' => wp_json_encode( true ), ), - '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 ) { -@@ -585,7 +581,7 @@ +@@ -663,7 +659,7 @@ 'translations' => wp_json_encode( $translations ), 'locale' => wp_json_encode( $locales ), ), - '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 ) {