Changeset 2534

Timestamp:

04/14/05 00:09:52 (4 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

Files:

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

trunk/wp-blog-header.php

@@ -134 +134 @@
-    else $client_etag = false;
-
-($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;
+$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;
+}
-        }
-    }