Ticket #28722: 28722.6.diff

src/wp-admin/load-scripts.php

@@ -33 +33 @@
 $wp_scripts = new WP_Scripts();
 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) )
                 continue;
@@ -41 +50 @@
         $out .= get_file($path) . "\n";
 }
 
+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');
 header("Cache-Control: public, max-age=$expires_offset");

src/wp-admin/load-styles.php

@@ -30 +30 @@
 $wp_styles = new WP_Styles();
 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) )
                 continue;
@@ -54 +63 @@
         }
 }
 
+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');
 header("Cache-Control: public, max-age=$expires_offset");