Changeset 2534 for trunk/wp-blog-header.php

Timestamp:

04/14/2005 12:09:52 AM (21 years ago)

Author:

matt

Message:

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

File:

• trunk/wp-blog-header.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -134 +134 @@
         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 ( preg_match('/cgi/',php_sapi_name()) ) {
-                    header('Status: 304 Not Modified');
-                    echo "\r\n\r\n";
-                    exit;
-                } else {
-                    if ( version_compare(phpversion(), '4.3.0', '>=') ) {
-                        header('Not Modified', TRUE, 304);
-                    } else {
-                        header('HTTP/1.x 304 Not Modified');
-                    }
-                        exit;
+        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";
+                                 exit;
+                        } else {
+                                 if ( version_compare(phpversion(), '4.3.0', '>=') ) {
+                                          header('Not Modified', TRUE, 304);
+                                 } else {
+                                          header('HTTP/1.x 304 Not Modified');
+                                 }
+                                exit;
+                        }
                 }
         }