Ticket #36451: moha-36451.diff

wp-includes/rest-api.php

@@ -319 +319 @@
         }
 
         if ( is_ssl() ) {
+                $http_host = $_SERVER['SERVER_NAME'];
+                if ( isset( $_SERVER['HTTP_HOST'] ) ) {
+                        $http_host = $_SERVER['HTTP_HOST'];
+                }
                 // If the current host is the same as the REST URL host, force the REST URL scheme to HTTPS.
-                if ( $_SERVER['SERVER_NAME'] === parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) ) {
+                if ( $http_host === parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) ) {
                         $url = set_url_scheme( $url, 'https' );
                 }
         }