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:
parent
c882b0ab31
commit
a0e1196acf
|
@ -133,9 +133,8 @@ if ( !empty($error) && '404' == $error ) {
|
|||
if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
|
||||
else $client_etag = false;
|
||||
|
||||
if ( ($client_last_modified && $client_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 ( $client_last_modified && $client_etag ) {
|
||||
if ( (strtotime($client_last_modified) <= strtotime($wp_last_modified)) || ($client_etag == $wp_etag) ) {
|
||||
if ( preg_match('/cgi/',php_sapi_name()) ) {
|
||||
header('Status: 304 Not Modified');
|
||||
echo "\r\n\r\n";
|
||||
|
@ -150,6 +149,7 @@ if ( !empty($error) && '404' == $error ) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$use_gzipcompression = get_settings('gzipcompression');
|
||||
|
||||
|
|
Loading…
Reference in New Issue