Changeset 38122

Timestamp:

07/20/2016 06:18:30 PM (8 years ago)

Author:

ocean90

Message:

Script Loader: Use dns-prefetch for the Emoji CDN.

• preconnect will be potentially pretty heavy on the CDN. With the Unicode 9.0 emoji update, almost all browsers will trigger the preconnect.
• preconnect only opens one connection, but s.w.org is HTTP/1.1, so the browser will use the preconnected connection for the first emoji, then it has to open new connections for subsequent emoji.

Also use the same URL as we use for the emoji_svg_url filter. This will print the hint for the correct CDN in case someone uses a custom CDN.

Props peterwilsoncc.
Fixes #37387.

Location:

trunk

Files:

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

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

@@ -2803 +2803 @@
     $hints = array(
         'dns-prefetch' => wp_dependencies_unique_hosts(),
-        'preconnect'   => array( 's.w.org' ),
+        'preconnect'   => array(),
         'prefetch'     => array(),
         'prerender'    => array(),
     );
+
+    /*
+     * Add DNS prefetch for the Emoji CDN.
+     * The path is removed in the foreach loop below.
+     */
+    /** This filter is documented in wp-includes/formatting.php */
+    $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/' );
 
     foreach ( $hints as $relation_type => $urls ) {

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'>\n";
+        $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
 
         $this->expectOutputString( $expected );
@@ -40 +40 @@
 
     function test_dns_prefetching() {
-        $expected = "<link rel='dns-prefetch' href='//wordpress.org'>\n" .
+        $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
+                    "<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";
+                    "<link rel='dns-prefetch' href='//make.wordpress.org'>\n";
 
         add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_domains' ), 10, 2 );
@@ -68 +68 @@
 
     function test_prerender() {
-        $expected = "<link rel='preconnect' href='http://s.w.org'>\n" .
+        $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
                     "<link rel='prerender' href='https://make.wordpress.org/great-again'>\n" .
                     "<link rel='prerender' href='http://jobs.wordpress.net'>\n" .
@@ -94 +94 @@
 
     function test_parse_url_dns_prefetch() {
-        $expected = "<link rel='dns-prefetch' href='//make.wordpress.org'>\n" .
-                    "<link rel='preconnect' href='http://s.w.org'>\n";
+        $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n" .
+                    "<link rel='dns-prefetch' href='//make.wordpress.org'>\n";
 
         add_filter( 'wp_resource_hints', array( $this, '_add_dns_prefetch_long_urls' ), 10, 2 );
@@ -116 +116 @@
     function test_dns_prefetch_styles() {
         $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\n" .
-                    "<link rel='preconnect' href='http://s.w.org'>\n";
+                    "<link rel='dns-prefetch' href='//s.w.org'>\n";
 
         $args = array(
@@ -135 +135 @@
     function test_dns_prefetch_scripts() {
         $expected = "<link rel='dns-prefetch' href='//fonts.googleapis.com'>\n" .
-                    "<link rel='preconnect' href='http://s.w.org'>\n";
+                    "<link rel='dns-prefetch' href='//s.w.org'>\n";
 
         $args = array(
@@ -152 +152 @@
 
     function test_dns_prefetch_scripts_does_not_included_registered_only() {
-        $expected = "<link rel='preconnect' href='http://s.w.org'>\n";
+        $expected = "<link rel='dns-prefetch' href='//s.w.org'>\n";
         $unexpected = "<link rel='dns-prefetch' href='//wordpress.org'>\n";