Changeset 10619

Timestamp:

02/21/2009 09:39:06 PM (16 years ago)

Author:

westi

Message:

Allow for the HTTP headers returned by WordPress to be filtered by a plugin. Fixes #9205 props filosofo.

Location:

trunk/wp-includes

Files:

• classes.php (modified) (3 diffs)
• functions.php (modified) (2 diffs)

trunk/wp-includes/classes.php

@@ -303 +303 @@
      */
     function send_headers() {
-        @header('X-Pingback: '. get_bloginfo('pingback_url'));
+        $headers = array('X-Pingback' => get_bloginfo('pingback_url'));
+        $status = null;
         if ( is_user_logged_in() )
-            nocache_headers();
+            $headers = array_merge($headers, wp_get_nocache_headers());
         if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
-            status_header( 404 );
+            $status = 404;
             if ( !is_user_logged_in() )
-                nocache_headers();
-            @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+                $headers = array_merge($headers, wp_get_nocache_headers());
+            $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
         } else if ( empty($this->query_vars['feed']) ) {
-            @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+            $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
         } else {
             // We're showing a feed, so WP is indeed the only thing that last changed
@@ -330 +331 @@
                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
             $wp_etag = '"' . md5($wp_last_modified) . '"';
-            @header("Last-Modified: $wp_last_modified");
-            @header("ETag: $wp_etag");
+            $headers['Last-Modified'] = $wp_last_modified;
+            $headers['ETag'] = $wp_etag;
 
             // Support for Conditional GET
@@ -348 +349 @@
                      (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
                      (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
-                status_header( 304 );
-                exit;
+                $status = 304;
+                add_action('send_headers', 'exit', 1);
             }
         }
+
+        $headers = apply_filters('wp_headers', $headers, $this); 
+
+        if ( ! empty( $status ) ) 
+            status_header( $status );
+        foreach( (array) $headers as $name => $field_value )
+            @header("{$name}: {$field_value}");
 
         do_action_ref_array('send_headers', array(&$this));

trunk/wp-includes/functions.php

@@ -1461 +1461 @@
 
 /**
+ * Gets the header information to prevent caching.
+ *
+ * The several different headers cover the different ways cache prevention is handled
+ * by different browsers
+ *
+ * @since 2.8
+ *
+ * @uses apply_filters()
+ * @return array The associative array of header names and field values.
+ */
+function wp_get_nocache_headers() {
+    $headers = array(
+        'Expires' => 'Wed, 11 Jan 1984 05:00:00 GMT',
+        'Last-Modified' => gmdate( 'D, d M Y H:i:s' ) . ' GMT',
+        'Cache-Control' => 'no-cache, must-revalidate, max-age=0',
+        'Pragma' => 'no-cache',
+    );
+    return apply_filters('nocache_headers', $headers);  
+}
+
+/**
  * Sets the headers to prevent caching for the different browsers.
  *
@@ -1467 +1488 @@
  *
  * @since 2.0.0
+ * @uses wp_get_nocache_headers()
  */
 function nocache_headers() {
-    // why are these @-silenced when other header calls aren't?
-    @header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
-    @header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-    @header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-    @header( 'Pragma: no-cache' );
+    $headers = wp_get_nocache_headers();
+    foreach( (array) $headers as $name => $field_value ) 
+        @header("{$name}: {$field_value}");     
 }