Ticket #23021: 23021.4.diff

wp-includes/functions.php

@@ -902 +902 @@
 function wp_get_nocache_headers() {
         $headers = array(
                 'Expires' => 'Wed, 11 Jan 1984 05:00:00 GMT',
-                'Last-Modified' => '',
                 'Cache-Control' => 'no-cache, must-revalidate, max-age=0',
                 'Pragma' => 'no-cache',
         );
 
         if ( function_exists('apply_filters') ) {
                 $headers = (array) apply_filters('nocache_headers', $headers);
+                unset( $headers['Last-Modified'] );
         }
         return $headers;
 }
@@ -924 +924 @@
  */
 function nocache_headers() {
         $headers = wp_get_nocache_headers();
+
+        // In PHP 5.3+, make sure we are not sending a Last-Modified header.
+        if ( function_exists( 'header_remove' ) ) {
+                @header_remove( 'Last-Modified' );
+        } else {
+                // In PHP 5.2, send an empty Last-Modified header, but only as a
+                // last resort to override a header already sent. #WP23021
+                foreach ( headers_list() as $header ) {
+                        if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+                                $headers['Last-Modified'] = '';
+                                break;
+                        }
+                }
+        }
+
         foreach( $headers as $name => $field_value )
                 @header("{$name}: {$field_value}");
-        if ( empty( $headers['Last-Modified'] ) && function_exists( 'header_remove' ) )
-                @header_remove( 'Last-Modified' );
 }
 
 /**

wp-includes/class-wp.php

@@ -319 +319 @@
         function send_headers() {
                 $headers = array('X-Pingback' => get_bloginfo('pingback_url'));
                 $status = null;
-                $exit_required = false;
+                $exit_required = $nocache_headers = false;
 
-                if ( is_user_logged_in() )
+                if ( is_user_logged_in() ) {
                         $headers = array_merge($headers, wp_get_nocache_headers());
+                        $nocache_headers = true;
+                }
                 if ( ! empty( $this->query_vars['error'] ) ) {
                         $status = (int) $this->query_vars['error'];
                         if ( 404 === $status ) {
-                                if ( ! is_user_logged_in() )
+                                if ( ! is_user_logged_in() ) {
                                         $headers = array_merge($headers, wp_get_nocache_headers());
+                                        $nocache_headers = true;
+                                }
                                 $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
                         } elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
                                 $exit_required = true;
@@ -378 +382 @@
 
                 if ( ! empty( $status ) )
                         status_header( $status );
+
+                if ( $nocache_headers || empty( $headers['Last-Modified'] ) ) {
+                        unset( $headers['Last-Modified'] );
+
+                        // In PHP 5.3+, make sure we are not sending a Last-Modified header.
+                        if ( function_exists( 'header_remove' ) ) {
+                                @header_remove( 'Last-Modified' );
+                        } else {
+                                // In PHP 5.2, send an empty Last-Modified header, but only as a
+                                // last resort to override a header already sent. #WP23021
+                                foreach ( headers_list() as $header ) {
+                                        if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+                                                $headers['Last-Modified'] = '';
+                                                break;
+                                        }
+                                }
+                        }
+                }
+
                 foreach( (array) $headers as $name => $field_value )
                         @header("{$name}: {$field_value}");
 
-                if ( isset( $headers['Last-Modified'] ) && empty( $headers['Last-Modified'] ) && function_exists( 'header_remove' ) )
-                        @header_remove( 'Last-Modified' );
-
                 if ( $exit_required )
                         exit();