Changeset 38036

Timestamp:

07/12/2016 11:31:58 AM (8 years ago)

Author:

ocean90

Message:

Resource Hints: Remove schemes from dns-prefetch resource hint outputs.

"wordpress.org", "http://wordpress.org", and "https://wordpress.org" should all have the same DNS lookup.
Also, replace \r\n with \n and ensure that invalid URLs are skipped.

Props niallkennedy, peterwilsoncc.
Fixes #37240.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (2 diffs)
• tests/phpunit/tests/general/resourceHints.php (modified) (8 diffs)

trunk/src/wp-includes/general-template.php

@@ -2816 +2816 @@
          */
         $urls = apply_filters( 'wp_resource_hints', $urls, $relation_type );
-        $urls = array_unique( $urls );
-
-        foreach ( $urls as $url ) {
+
+        foreach ( $urls as $key => $url ) {
             $url = esc_url( $url, array( 'http', 'https' ) );
+            if ( ! $url ) {
+                unset( $urls[ $key ] );
+                continue;
+            }
 
             if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
                 $parsed = wp_parse_url( $url );
                 if ( empty( $parsed['host'] ) ) {
+                    unset( $urls[ $key ] );
                     continue;
                 }
 
-                if ( ! empty( $parsed['scheme'] ) ) {
+                if ( 'dns-prefetch' === $relation_type ) {
+                    $url = '//' . $parsed['host'];
+                } else if ( ! empty( $parsed['scheme'] ) ) {
                     $url = $parsed['scheme'] . '://' . $parsed['host'];
                 } else {
@@ -2834 +2840 @@
             }
 
-            printf( "<link rel='%s' href='%s'>\r\n", $relation_type, $url );
+            $urls[ $key ] = $url;
+        }
+
+        $urls = array_unique( $urls );
+
+        foreach ( $urls as $url ) {
+            printf( "<link rel='%s' href='%s'>\n", $relation_type, $url );
         }
     }

trunk/tests/phpunit/tests/general/resourceHints.php

@@ -32 +32 @@
 
     function test_should_have_defaults_on_frontend() {
-        $expected = "<link rel='preconnect' href='http://s.w.org'>\r\n";
+        $expected = "<link rel='preconnect' href='http://s.w.org'>\n";
 
         $this->expectOutputString( $expected );
@@ -40 +40 @@
 
     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" .
-                    "<link rel='preconnect' href='http://s.w.org'>\r\n";
+        $expected = "<link rel='dns-prefetch' href='//wordpress.org'>\n" .
+                    "<link rel='dns-prefetch' href='//google.com'>\n" .
+                    "<link rel='dns-prefetch' href='//make.wordpress.org'>\n" .
+                    "<link rel='preconnect' href='http://s.w.org'>\n";
 
         add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ), 10, 2 );
@@ -57 +57 @@
         if ( 'dns-prefetch' === $method ) {
             $hints[] = 'http://wordpress.org';
+            $hints[] = 'https://wordpress.org';
+            $hints[] = 'htps://wordpress.org'; // Invalid URLs should be skipped.
             $hints[] = 'https://google.com';
             $hints[] = '//make.wordpress.org';
+            $hints[] = 'https://wordpress.org/plugins/';
         }
 
@@ -65 +68 @@
 
     function test_prerender() {
-        $expected = "<link rel='preconnect' href='http://s.w.org'>\r\n" .
-                    "<link rel='prerender' href='https://make.wordpress.org/great-again'>\r\n" .
-                    "<link rel='prerender' href='http://jobs.wordpress.net'>\r\n" .
-                    "<link rel='prerender' href='//core.trac.wordpress.org'>\r\n";
+        $expected = "<link rel='preconnect' href='http://s.w.org'>\n" .
+                    "<link rel='prerender' href='https://make.wordpress.org/great-again'>\n" .
+                    "<link rel='prerender' href='http://jobs.wordpress.net'>\n" .
+                    "<link rel='prerender' href='//core.trac.wordpress.org'>\n";
 
         add_filter( 'wp_resource_hints', array( $this, '_add_prerender_urls' ), 10, 2 );
@@ -84 +87 @@
             $hints[] = 'http://jobs.wordpress.net';
             $hints[] = '//core.trac.wordpress.org';
+            $hints[] = 'htps://wordpress.org'; // Invalid URLs should be skipped.
         }
 
@@ -90 +94 @@
 
     function test_parse_url_dns_prefetch() {
-        $expected = "<link rel='dns-prefetch' href='http://make.wordpress.org'>\r\n" .
-                    "<link rel='preconnect' href='http://s.w.org'>\r\n";
+        $expected = "<link rel='dns-prefetch' href='//make.wordpress.org'>\n" .
+                    "<link rel='preconnect' href='http://s.w.org'>\n";
 
         add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ), 10, 2 );
@@ -111 +115 @@
 
     function test_dns_prefetch_styles() {
-        $expected = "<link rel='dns-prefetch' href='http://fonts.googleapis.com'>\r\n" .
-                    "<link rel='preconnect' href='http://s.w.org'>\r\n";
+        $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\n" .
+                    "<link rel='preconnect' href='http://s.w.org'>\n";
 
         $args = array(
@@ -130 +134 @@
 
     function test_dns_prefetch_scripts() {
-        $expected = "<link rel='dns-prefetch' href='http://fonts.googleapis.com'>\r\n" .
-                    "<link rel='preconnect' href='http://s.w.org'>\r\n";
+        $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\n" .
+                    "<link rel='preconnect' href='http://s.w.org'>\n";
 
         $args = array(