Ticket #17010: 17010.diff

src/wp-includes/class-http.php

@@ -366 +366 @@
 
                 $response = $transports[$class]->request( $url, $args );
 
+                if ( ! is_wp_error( $response ) && ( wp_remote_retrieve_response_code( $response ) < 200 ) ) {
+                        $error = sprintf(
+                                '%s (%s)',
+                                wp_remote_retrieve_response_code( $response ),
+                                wp_remote_retrieve_response_message( $response )
+                        );
+                        $response = new WP_Error( 'http_request_failed', $error );
+                }
+
                 /**
                  * Fires after an HTTP API response is received and before the response is returned.
                  *

tests/phpunit/tests/http/base.php

@@ -353 +353 @@
                 $this->assertTrue( ! is_wp_error( $res ), print_r( $res, true ) );
         }
 
+        /**
+         * Test that server response codes are handled consistently
+         * 
+         * @ticket 17010
+         *
+         * @dataProvider data_http_status_codes
+         */
+        function test_http_response_code_handling( $code ) {
+
+                $res = wp_remote_head( sprintf( 'http://trunk.wp/status.php?status=%d', $code ) );
+
+                if ( $code < 200 ) {
+
+                        // A 1xx request should result in an error
+                        if ( ! is_wp_error( $res ) ) {
+                                $this->fail( sprintf( '%s (status: %d)', wp_remote_retrieve_response_message( $res ), $code ) );
+                        }
+
+                        $this->assertSame( 'http_request_failed', $res->get_error_code() );
+
+                } else {
+
+                        // Any other request should not result in an error
+                        if ( is_wp_error( $res ) ) {
+                                $this->fail( sprintf( '%s (status: %d)', $res->get_error_message(), $code ) );
+                        }
+
+                        $this->assertSame( $code, wp_remote_retrieve_response_code( $res ) );
+
+                }
+
+        }
+
+        function data_http_status_codes() {
+                global $wp_header_to_desc;
+
+                // Hackedy hack! This populates the $wp_header_to_desc global
+                get_status_header_desc( 200 );
+
+                $data = array();
+
+                foreach ( $wp_header_to_desc as $code => $description ) {
+                        $data[] = array(
+                                $code,
+                        );
+                }
+
+                return $data;
+
+        }
 
 }