Ticket #40784: 40784.diff

tests/phpunit/tests/xmlrpc/client.php

@@ -26 +26 @@
                 $this->assertFalse( $client->port );
                 $this->assertEquals( '/server.php?this-is-needed=true', $client->path );
         }
+
+        /**
+         * @ticket 40784
+         */
+        function test_wp_ixr_client_can_handle_protocolless_urls() {
+                $client = new WP_HTTP_IXR_Client( '//example.com/server.php' );
+                $this->assertEquals( '', $client->scheme );
+                $this->assertEquals( 'example.com', $client->server );
+        }
+
+        /**
+         * @ticket 40784
+         */
+        function test_wp_ixr_client_can_handle_relative_urls() {
+                $client = new WP_HTTP_IXR_Client( '/server.php' );
+                $this->assertEquals( '', $client->scheme );
+                $this->assertEquals( '', $client->server );
+                $this->assertEquals( '/server.php', $client->path );
+        }
+
+        /**
+         * @ticket 40784
+         */
+        function test_wp_ixr_client_can_handle_invalid_urls() {
+                $client = new WP_HTTP_IXR_Client( '' );
+                $this->assertEquals( '', $client->scheme );
+                $this->assertEquals( '', $client->server );
+                $this->assertEquals( '', $client->path );
+        }
 }
 

src/wp-includes/class-wp-http-ixr-client.php

@@ -23 +23 @@
                 if ( ! $path ) {
                         // Assume we have been given a URL instead
                         $bits = parse_url($server);
-                        $this->scheme = $bits['scheme'];
-                        $this->server = $bits['host'];
+                        $this->scheme = isset($bits['scheme']) ? $bits['scheme'] : '';
+                        $this->server = isset($bits['host']) ? $bits['host'] : '';
                         $this->port = isset($bits['port']) ? $bits['port'] : $port;
                         $this->path = !empty($bits['path']) ? $bits['path'] : '/';