Ticket #65448: 65448.2.diff

src/wp-includes/http.php

@@ -750 +750 @@
                 $url        = 'placeholder://placeholder' . $url;
         }
 
-        $parts = parse_url( $url );
+        /*
+         * PHP 8.5+: Prefer the WHATWG URL parser.
+         */
+        if ( class_exists( 'Uri\\WhatWg\\Url' ) ) {
+                $parsed = \Uri\WhatWg\Url::parse( $url );
 
-        if ( false === $parts ) {
-                // Parsing failure.
-                return $parts;
+                if ( null === $parsed ) {
+                        return false;
+                }
+
+                $parts = array();
+
+                $scheme = $parsed->getScheme();
+                if ( null !== $scheme ) {
+                        $parts['scheme'] = $scheme;
+                }
+
+                $host = $parsed->getAsciiHost();
+                if ( null !== $host ) {
+                        $parts['host'] = $host;
+                }
+
+                $port = $parsed->getPort();
+                if ( null !== $port ) {
+                        $parts['port'] = $port;
+                }
+
+                $user = $parsed->getUsername();
+                if ( null !== $user ) {
+                        $parts['user'] = $user;
+                }
+
+                $pass = $parsed->getPassword();
+                if ( null !== $pass ) {
+                        $parts['pass'] = $pass;
+                }
+
+                $path = $parsed->getPath();
+                if ( '' !== $path ) {
+                        $parts['path'] = $path;
+                }
+
+                $query = $parsed->getQuery();
+                if ( null !== $query ) {
+                        $parts['query'] = $query;
+                }
+
+                $fragment = $parsed->getFragment();
+                if ( null !== $fragment ) {
+                        $parts['fragment'] = $fragment;
+                }
+        } else {
+                $parts = parse_url( $url );
+
+                if ( false === $parts ) {
+                        return false;
+                }
         }
 
-        // Remove the placeholder values.
         foreach ( $to_unset as $key ) {
                 unset( $parts[ $key ] );
         }