Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fixed cache's handling of HTTP headers (passed all 9 unit tests)

4.3.x
Kjartan Mannes 2003-09-29 13:41:22 +00:00
parent 0c3cc7b487
commit 46e43ebed1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
includes/common.inc
View File

@ -1173,17 +1173,18 @@ function drupal_page_header() {
$etag = '"'. md5($date) .'"'; $etag = '"'. md5($date) .'"';
// Check http headers: // Check http headers:
$modified_since = isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) ? $_SERVER["HTTP_IF_MODIFIED_SINCE"] == $date : false; $modified_since = isset($_SERVER["HTTP_IF_MODIFIED_SINCE"]) ? $_SERVER["HTTP_IF_MODIFIED_SINCE"] == $date : NULL
$none_match = isset($_SERVER["HTTP_IF_NONE_MATCH"]) ? $_SERVER["HTTP_IF_NONE_MATCH"] == $etag : false; $none_match = isset($_SERVER["HTTP_IF_NONE_MATCH"]) ? $_SERVER["HTTP_IF_NONE_MATCH"] == $etag : NULL;
// Send appropriate response: // The type checking here is very important, be careful when changing entries.
//header("Last-Modified: $date"); if (($modified_since !== NULL || $none_match !== NULL) && $modified_since !== false && $none_match !== false) {
header("ETag: $etag");
if ($modified_since && $none_match) {
header("HTTP/1.0 304 Not Modified"); header("HTTP/1.0 304 Not Modified");
exit(); exit();
} }
// Send appropriate response:
header("Last-Modified: $date");
header("ETag: $etag");
print $cache->data; print $cache->data;
/* /*