He ain't ugly, he's my brother.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-05-05 23:05:51 +00:00
parent f0a54726e0
commit 3cc914328a
1 changed files with 13 additions and 14 deletions

View File

@ -133,23 +133,22 @@ if ( !empty($error) && '404' == $error ) {
if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']); if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
else $client_etag = false; else $client_etag = false;
if ( $client_last_modified && $client_etag ) { if ( ($client_last_modified && $client_etag) ?
if ( (strtotime($client_last_modified) >= strtotime($wp_last_modified)) || ($client_etag == $wp_etag) ) { ((strtotime($client_last_modified) >= strtotime($wp_last_modified)) && ($client_etag == $wp_etag)) :
((strtotime($client_last_modified) >= strtotime($wp_last_modified)) || ($client_etag == $wp_etag)) ) {
if ( preg_match('/cgi/',php_sapi_name()) ) { if ( preg_match('/cgi/',php_sapi_name()) ) {
header('Status: 304 Not Modified'); header('Status: 304 Not Modified');
echo "\r\n\r\n"; echo "\r\n\r\n";
exit; exit;
} else { } else {
if ( version_compare(phpversion(), '4.3.0', '>=') ) { if ( version_compare(phpversion(), '4.3.0', '>=') )
header('Not Modified', TRUE, 304); header('Not Modified', TRUE, 304);
} else { else
header('HTTP/1.x 304 Not Modified'); header('HTTP/1.x 304 Not Modified');
}
exit; exit;
} }
} }
} }
}
$use_gzipcompression = get_settings('gzipcompression'); $use_gzipcompression = get_settings('gzipcompression');