Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Logic was *really* confusing and it seemed to return 304s badly, breaking all dashboards when I updated the dev blog 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
matt 2005-04-14 00:09:52 +00:00
parent c882b0ab31
commit a0e1196acf
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wp-blog-header.php
View File

@ -133,20 +133,20 @@ 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 ) {
((strtotime($client_last_modified) >= strtotime($wp_last_modified)) && ($client_etag == $wp_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)) ) { 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; }
} }
} }
} }