From fdb244801f5bf77d99cf5963a7d3c93999273edd Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 4 Oct 2006 03:55:04 +0000
Subject: [PATCH] nocache_headers from _ck_ and Nazgul.  fixes #3027

git-svn-id: http://svn.automattic.com/wordpress/branches/2.0@4292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/classes.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 335fff78ce..4043e691cc 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -1621,6 +1621,8 @@ class WP {
 			nocache_headers();
 		if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
 			status_header( 404 );
+			if ( !is_user_logged_in() )
+				nocache_headers();
 			@header('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'));
@@ -1710,6 +1712,7 @@ class WP {
 		if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) {
 			$wp_query->set_404();
 			status_header( 404 );
+			nocache_headers();
 		}	elseif( is_404() != true ) {
 			status_header( 200 );
 		}