diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-12-15 08:45:32 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-12-15 08:45:32 +0000 |
| commit | 2d6b6d492f9757ee19d992f90d73b99235f58609 (patch) | |
| tree | ee1c41a0043d643779b9510f61611a38675d1b3e /includes | |
| parent | b792a6df2da73a59aaa75b0d3c0cb45e3eace17a (diff) | |
| download | brdo-2d6b6d492f9757ee19d992f90d73b99235f58609.tar.gz brdo-2d6b6d492f9757ee19d992f90d73b99235f58609.tar.bz2 | |
- Patch #566494 by Dave Reid, chx, JoshuaRogers, David_Rothstein, Rob Loach, TheRec, moshe weitzman: cron image does a full bootstrap on every page request so changing to a Javascript-based solution instead. Important performance fix -- what were we smoking? ;-)
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 8ff820452..27ffaa411 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3082,7 +3082,7 @@ function base_path() { * which on normal pages is up through the preprocess step of theme('html'). * Adding a link will overwrite a prior link with the exact same 'rel' and * 'href' attributes. - * + * * @param $attributes * Associative array of element attributes including 'href' and 'rel'. * @param $header @@ -3482,7 +3482,7 @@ function drupal_load_stylesheet_content($contents, $optimize = FALSE) { $contents = preg_replace('{ (?<=\\\\\*/)([^/\*]+/\*)([^\*/]+\*/) # Add a backslash also at the end ie-mac hack comment, so the next pass will not touch it. # The added backshlash does not affect the effectiveness of the hack. - }x', '\1\\\\\2', $contents); + }x', '\1\\\\\2', $contents); $contents = preg_replace('< \s*([@{}:;,]|\)\s|\s\()\s* | # Remove whitespace around separators, but keep space around parentheses. /\*[^*\\\\]*\*+([^/*][^*]*\*+)*/ | # Remove comments that are not CSS hacks. @@ -4571,6 +4571,10 @@ function drupal_page_set_cache() { $header_names = _drupal_set_preferred_header_name(); foreach (drupal_get_http_header() as $name_lower => $value) { $cache->headers[$header_names[$name_lower]] = $value; + if ($name_lower == 'expires') { + // Use the actual timestamp from an Expires header if available. + $cache->expire = strtotime($value); + } } if ($cache->data) { |