Changeset 58097 for trunk/src/wp-includes/media.php

Timestamp:

05/04/2024 07:23:31 PM (7 months ago)

Author:

johnbillion

Message:

Bootstrap/Load: Add support for custom ports in multisite site addresses.

This allows a Multisite network to use an address that includes a port name, such as example.com:1234, and adds support for this to the local development environment too. You can now run a Multisite installation on the local development environment, for example at localhost:8889.

This also fixes some bugs with running a single site installation on a port, and updates the testing infrastructure so that the whole test suite runs both with and without a port number.

Props djzone, scribu, nacin, ipstenu, F J Kaiser, jeremyfelt, johnjamesjacoby, spacedmonkey, PerS, Clorith, Blackbam, enrico.sorcinelli, Jules Colle, obliviousharmony, desrosj, johnbillion

Fixes #21077, #52088

File:

• trunk/src/wp-includes/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -1364 +1364 @@
      * (which is to say, when they share the domain name of the current request).
      */
-    if ( is_ssl() && ! str_starts_with( $image_baseurl, 'https' ) && parse_url( $image_baseurl, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
-        $image_baseurl = set_url_scheme( $image_baseurl, 'https' );
+    if ( is_ssl() && ! str_starts_with( $image_baseurl, 'https' ) ) {
+        // Since the `Host:` header might contain a port we should
+        // compare it against the image URL using the same port.
+        $parsed = parse_url( $image_baseurl );
+        $domain = $parsed['host'];
+        if ( isset( $parsed['port'] ) ) {
+            $domain .= ':' . $parsed['port'];
+        }
+        if ( $_SERVER['HTTP_HOST'] === $domain ) {
+            $image_baseurl = set_url_scheme( $image_baseurl, 'https' );
+        }
     }