Ticket #37652: 37652.2.diff

src/wp-includes/general-template.php

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

tests/phpunit/tests/general/resourceHints.php

@@ -92 +92 @@
                 return $hints;
         }
 
+        function test_preconnect() {
+                $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
+                                        "<link rel='preconnect' href='//core.trac.wordpress.org'>\n";
+
+                add_filter( 'wp_resource_hints', array( $this, '_add_preconnect_urls' ), 10, 2 );
+
+                $actual = get_echo( 'wp_resource_hints' );
+
+                remove_filter( 'wp_resource_hints', array( $this, '_add_preconnect_urls' ) );
+
+                $this->assertEquals( $expected, $actual );
+        }
+
+        function _add_preconnect_urls( $hints, $method ) {
+                if ( 'preconnect' === $method ) {
+                        $hints[] = '//core.trac.wordpress.org/ticket/37652';
+                }
+
+                return $hints;
+        }
+
         function test_parse_url_dns_prefetch() {
                 $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
                                         "<link rel='dns-prefetch' href='//make.wordpress.org'>\n";
@@ -176 +197 @@
                 $actual = get_echo( 'wp_resource_hints' );
                 $this->assertEquals( $expected, $actual );
         }
+
+        function test_misformed_urls() {
+                $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
+
+                // Errant colon.
+                add_filter( 'wp_resource_hints', array( $this, '_add_misformed_url_errant_colon' ), 10, 2 );
+                $actual = get_echo( 'wp_resource_hints' );
+                remove_filter( 'wp_resource_hints', array( $this, '_add_misformed_url_errant_colon' ) );
+                $this->assertEquals( $expected, $actual );
+
+                // Unsupported Scheme.
+                add_filter( 'wp_resource_hints', array( $this, '_add_misformed_url_unsupported_scheme' ), 10, 2 );
+                $actual = get_echo( 'wp_resource_hints' );
+                remove_filter( 'wp_resource_hints', array( $this, '_add_misformed_url_unsupported_scheme' ) );
+                $this->assertEquals( $expected, $actual );
+        }
+
+        function _add_misformed_url_errant_colon( $hints, $method ) {
+                if ( 'preconnect' === $method ) {
+                        $hints[] = '://core.trac.wordpress.org/ticket/37652';
+                }
+
+                return $hints;
+        }
+
+        function _add_misformed_url_unsupported_scheme( $hints, $method ) {
+                if ( 'preconnect' === $method ) {
+                        $hints[] = 'git://develop.git.wordpress.org/';
+                }
+
+                return $hints;
+        }
 }