Ticket #37240: 37240.diff

src/wp-includes/general-template.php

@@ -2826 +2826 @@
                                         continue;
                                 }
 
-                                if ( ! empty( $parsed['scheme'] ) ) {
+                                if ( 'dns-prefetch' === $relation_type ) {
+                                        $url = '//' . $parsed['host'];
+                                } else if ( ! empty( $parsed['scheme'] ) ) {
                                         $url = $parsed['scheme'] . '://' . $parsed['host'];
                                 } else {
                                         $url = $parsed['host'];

tests/phpunit/tests/general/resourceHints.php

@@ -39 +39 @@
         }
 
         function test_dns_prefetching() {
-                $expected = "<link rel='dns-prefetch' href='http://wordpress.org'>\r\n" .
-                                        "<link rel='dns-prefetch' href='https://google.com'>\r\n" .
-                                        "<link rel='dns-prefetch' href='make.wordpress.org'>\r\n" .
+                $expected = "<link rel='dns-prefetch' href='//wordpress.org'>\r\n" .
+                                        "<link rel='dns-prefetch' href='//google.com'>\r\n" .
+                                        "<link rel='dns-prefetch' href='//make.wordpress.org'>\r\n" .
                                         "<link rel='preconnect' href='http://s.w.org'>\r\n";
 
                 add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ), 10, 2 );
@@ -89 +89 @@
         }
 
         function test_parse_url_dns_prefetch() {
-                $expected = "<link rel='dns-prefetch' href='http://make.wordpress.org'>\r\n" .
+                $expected = "<link rel='dns-prefetch' href='//make.wordpress.org'>\r\n" .
                                         "<link rel='preconnect' href='http://s.w.org'>\r\n";
 
                 add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ), 10, 2 );
@@ -113 +113 @@
          * @group foo
          */
         function test_dns_prefetch_styles() {
-                $expected = "<link rel='dns-prefetch' href='http://fonts.googleapis.com'>\r\n" .
+                $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\r\n" .
                                         "<link rel='preconnect' href='http://s.w.org'>\r\n";
 
                 $args = array(
@@ -132 +132 @@
         }
 
         function test_dns_prefetch_scripts() {
-                $expected = "<link rel='dns-prefetch' href='http://fonts.googleapis.com'>\r\n" .
+                $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\r\n" .
                                         "<link rel='preconnect' href='http://s.w.org'>\r\n";
 
                 $args = array(