Ticket #52783: 52783.diff

src/wp-includes/https-detection.php

@@ -143 +143 @@
                 $response = $unverified_response;
         }
 
-        if ( ! is_wp_error( $response ) ) {
-                if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
-                        $support_errors->add( 'bad_response_code', wp_remote_retrieve_response_message( $response ) );
-                } elseif ( false === wp_is_local_html_output( wp_remote_retrieve_body( $response ) ) ) {
-                        $support_errors->add( 'bad_response_source', __( 'It looks like the response did not come from this site.' ) );
-                }
+        if ( ! is_wp_error( $response ) && 200 !== wp_remote_retrieve_response_code( $response ) ) {
+                $support_errors->add( 'bad_response_code', wp_remote_retrieve_response_message( $response ) );
         }
 
         update_option( 'https_detection_errors', $support_errors->errors );

tests/phpunit/tests/https-detection.php

@@ -97 +97 @@
                         get_option( 'https_detection_errors' )
                 );
 
-                // If request succeeds, but response was not generated by this
-                // WordPress site, return error with 'bad_response_source' error code.
-                add_filter( 'pre_http_request', array( $this, 'mock_bad_source' ), 10, 2 );
-                wp_update_https_detection_errors();
-                $this->assertSame(
-                        array( 'bad_response_source' => array( 'It looks like the response did not come from this site.' ) ),
-                        get_option( 'https_detection_errors' )
-                );
-
                 // Check that the requests are made to the correct URL.
                 $this->assertSame( 'https://example.com/', $this->last_request_url );
         }
@@ -307 +298 @@
                 );
         }
 
-        public function mock_bad_source() {
-                // Looks like a success response, but is not generated by WordPress (e.g. missing RSD link).
-                return array(
-                        'body'     => $this->get_sample_html_string(),
-                        'response' => array(
-                                'code'    => 200,
-                                'message' => 'OK',
-                        ),
-                );
-        }
-
         private function mock_success() {
                 // Success response containing RSD link.
                 return array(