Changeset 38256 for branches/4.6

Timestamp:

08/13/2016 06:39:39 PM (10 years ago)

Author:

ocean90

Message:

Script Loader: Fix protocol-relative URLs for the preconnect relation type.

wp_resource_hints() parses the URL for the preconnect and dns-prefetch relation types to ensure correct values for both. While protocol-relative URLs are supported for dns-prefetch, the double slash was lost for preconnect.

Merge of [38255] to the 4.6 branch.

Props swissspidy, peterwilsoncc.
Props azaozz for review.
See #37652.

Location:

branches/4.6

Files:

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

branches/4.6/src/wp-includes/general-template.php

@@ -2840 +2840 @@
                                 }
 
-                                if ( 'dns-prefetch' === $relation_type ) {
-                                        $url = '//' . $parsed['host'];
-                                } else if ( ! empty( $parsed['scheme'] ) ) {
+                                if ( 'preconnect' === $relation_type && ! empty( $parsed['scheme'] ) ) {
                                         $url = $parsed['scheme'] . '://' . $parsed['host'];
                                 } else {
-                                        $url = $parsed['host'];
+                                        // Use protocol-relative URLs for dns-prefetch or if scheme is missing.
+                                        $url = '//' . $parsed['host'];
                                 }
                         }

branches/4.6/tests/phpunit/tests/general/resourceHints.php

@@ -67 +67 @@
         }
 
+        /**
+         * @ticket 37652
+         */
+        function test_preconnect() {
+                $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
+                            "<link rel='preconnect' href='//wordpress.org'>\n" .
+                            "<link rel='preconnect' href='https://make.wordpress.org'>\n" .
+                            "<link rel='preconnect' href='http://google.com'>\n" .
+                            "<link rel='preconnect' href='http://w.org'>\n";
+
+                add_filter( 'wp_resource_hints', array( $this, '_add_preconnect_domains' ), 10, 2 );
+
+                $actual = get_echo( 'wp_resource_hints' );
+
+                remove_filter( 'wp_resource_hints', array( $this, '_add_preconnect_domains' ) );
+
+                $this->assertEquals( $expected, $actual );
+        }
+
+        function _add_preconnect_domains( $hints, $method ) {
+                if ( 'preconnect' === $method ) {
+                        $hints[] = '//wordpress.org';
+                        $hints[] = 'https://make.wordpress.org';
+                        $hints[] = 'htps://example.com'; // Invalid URLs should be skipped.
+                        $hints[] = 'http://google.com';
+                        $hints[] = 'w.org';
+                }
+
+                return $hints;
+        }
+
         function test_prerender() {
                 $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
@@ -177 +208 @@
                 $this->assertEquals( $expected, $actual );
         }
+
+        /**
+         * @ticket 37652
+         */
+        function test_malformed_urls() {
+                $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
+
+                // Errant colon.
+                add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ), 10, 2 );
+                $actual = get_echo( 'wp_resource_hints' );
+                remove_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_errant_colon' ) );
+                $this->assertEquals( $expected, $actual );
+
+                // Unsupported Scheme.
+                add_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_unsupported_scheme' ), 10, 2 );
+                $actual = get_echo( 'wp_resource_hints' );
+                remove_filter( 'wp_resource_hints', array( $this, '_add_malformed_url_unsupported_scheme' ) );
+                $this->assertEquals( $expected, $actual );
+        }
+
+        function _add_malformed_url_errant_colon( $hints, $method ) {
+                if ( 'preconnect' === $method ) {
+                        $hints[] = '://core.trac.wordpress.org/ticket/37652';
+                }
+
+                return $hints;
+        }
+
+        function _add_malformed_url_unsupported_scheme( $hints, $method ) {
+                if ( 'preconnect' === $method ) {
+                        $hints[] = 'git://develop.git.wordpress.org/';
+                }
+
+                return $hints;
+        }
 }