Changeset 36312

Timestamp:

01/15/2016 10:22:24 AM (9 years ago)

Author:

swissspidy

Message:

Script Loader: Add Etag: $wp_version header in load-scripts.php and load-styles.php.

This improves performance since browsers won't re-download the scripts and styles when there was no change in $wp_version.

Props sergej.mueller, dd32, swissspidy.
Fixes #28722.

Location:

trunk/src/wp-admin

Files:

• load-scripts.php (modified) (2 diffs)
• load-styles.php (modified) (2 diffs)

trunk/src/wp-admin/load-scripts.php

@@ -34 +34 @@
 wp_default_scripts($wp_scripts);
 
+if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+    $protocol = $_SERVER['SERVER_PROTOCOL'];
+    if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+        $protocol = 'HTTP/1.0';
+    }
+    header( "$protocol 304 Not Modified" );
+    exit();
+}
+
 foreach ( $load as $handle ) {
     if ( !array_key_exists($handle, $wp_scripts->registered) )
@@ -42 +51 @@
 }
 
+header("Etag: $wp_version");
 header('Content-Type: application/javascript; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');

trunk/src/wp-admin/load-styles.php

@@ -31 +31 @@
 wp_default_styles($wp_styles);
 
+if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+    $protocol = $_SERVER['SERVER_PROTOCOL'];
+    if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+        $protocol = 'HTTP/1.0';
+    }
+    header( "$protocol 304 Not Modified" );
+    exit();
+}
+
 foreach ( $load as $handle ) {
     if ( !array_key_exists($handle, $wp_styles->registered) )
@@ -55 +64 @@
 }
 
+header("Etag: $wp_version");
 header('Content-Type: text/css; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');