Changeset 61713

Timestamp:

02/21/2026 04:40:18 AM (8 weeks ago)

Author:

westonruter

Message:

XML-RPC: Account for parsed server URLs that do not specify host or scheme.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10916

Props bluefuton, tfrommen, chrispecoraro, drebbits.web, westonruter.
Fixes #64635, #40784.

Location:

trunk

Files:

• src/wp-includes/IXR/class-IXR-client.php (modified) (1 diff)
• src/wp-includes/class-wp-http-ixr-client.php (modified) (1 diff)
• tests/phpunit/tests/xmlrpc/client.php (modified) (2 diffs)

trunk/src/wp-includes/IXR/class-IXR-client.php

@@ -31 +31 @@
             // Assume we have been given a URL instead
             $bits = parse_url($server);
-            $this->server = $bits['host'];
+            $this->server = $bits['host'] ?? '';
             $this->port = $bits['port'] ?? 80;
             $this->path = $bits['path'] ?? '/';

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

@@ -24 +24 @@
             // Assume we have been given a URL instead.
             $bits         = parse_url( $server );
-            $this->scheme = $bits['scheme'];
-            $this->server = $bits['host'];
+            $this->scheme = $bits['scheme'] ?? '';
+            $this->server = $bits['host'] ?? '';
             $this->port   = $bits['port'] ?? $port;
-            $this->path   = ! empty( $bits['path'] ) ? $bits['path'] : '/';
+            $this->path   = $bits['path'] ?? '/';
 
             // Make absolutely sure we have a path.

trunk/tests/phpunit/tests/xmlrpc/client.php

@@ -19 +19 @@
 
     /**
+     * @ticket 64635
+     */
+    public function test_ixr_client_can_handle_missing_host() {
+        $client = new IXR_Client( '/no-host-here' );
+        $this->assertSame( '', $client->server );
+    }
+
+    /**
      * @ticket 26947
      */
@@ -27 +35 @@
         $this->assertSame( '/server.php?this-is-needed=true', $client->path );
     }
+
+    /**
+     * @ticket 40784
+     */
+    public function test_wp_ixr_client_can_handle_protocolless_urls() {
+        $client = new WP_HTTP_IXR_Client( '//example.com/server.php' );
+        $this->assertSame( '', $client->scheme );
+        $this->assertSame( 'example.com', $client->server );
+    }
+
+    /**
+     * @ticket 40784
+     */
+    public function test_wp_ixr_client_can_handle_relative_urls() {
+        $client = new WP_HTTP_IXR_Client( '/server.php' );
+        $this->assertSame( '', $client->scheme );
+        $this->assertSame( '', $client->server );
+        $this->assertSame( '/server.php', $client->path );
+    }
+
+    /**
+     * @ticket 40784
+     */
+    public function test_wp_ixr_client_can_handle_invalid_urls() {
+        $client = new WP_HTTP_IXR_Client( '' );
+        $this->assertSame( '', $client->scheme );
+        $this->assertSame( '', $client->server );
+        $this->assertSame( '/', $client->path );
+    }
 }