diff --git a/ecrire/exec/js_menu_rubriques.php b/ecrire/exec/js_menu_rubriques.php index a081ea099d13875c5b94f9333e41e695bd7b2f66..a537831ecc2bcc57f525f974aad0a965365cd82a 100644 --- a/ecrire/exec/js_menu_rubriques.php +++ b/ecrire/exec/js_menu_rubriques.php @@ -152,7 +152,7 @@ function bandeau_rubrique($id_rubrique, $titre_rubrique, $z = 1) { function exec_js_menu_rubriques_dist() { - if (http_last_modified(@filemtime("js_menu_rubriques.php"), time() + 24 * 3600)) + if (http_last_modified(@filemtime(__FILE__), time() + 24 * 3600)) exit; header('Content-type: text/javascript; charset='.$GLOBALS['meta']['charset']); include_spip('inc/texte'); diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 66d948eea0c066b0af907f2e7af6f7da0f4c3016..bc9d16c285c531c069156b32867bc2efd5d7f252 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -520,12 +520,13 @@ function http_gmoddate($lastmodified) { } function http_last_modified($lastmodified, $expire = 0) { + if (!$lastmodified) return false; $gmoddate = http_gmoddate($lastmodified); - if ($GLOBALS['HTTP_IF_MODIFIED_SINCE'] + if ($_SERVER['HTTP_IF_MODIFIED_SINCE'] AND !preg_match(',IIS/,', $_SERVER['SERVER_SOFTWARE'])) # MSoft IIS is dumb { $if_modified_since = preg_replace('/;.*/', '', - $GLOBALS['HTTP_IF_MODIFIED_SINCE']); + $_SERVER['HTTP_IF_MODIFIED_SINCE']); $if_modified_since = trim(str_replace('GMT', '', $if_modified_since)); if ($if_modified_since == $gmoddate) { include_spip('inc/headers'); diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php index 95d04ea4a2709a1203d4bb5bbfe37bd24adf55aa..9c057ee860cfaf1f4ac027468cfb49ff29e07372 100644 --- a/ecrire/public/assembler.php +++ b/ecrire/public/assembler.php @@ -164,9 +164,11 @@ function assembler_page ($fond) { } } } - // toujours utile - $page['entetes']["Last-Modified"]=http_gmoddate($lastmodified)." GMT"; - $page['status'] = $status; + + if ($lastmodified) + $page['entetes']["Last-Modified"]=http_gmoddate($lastmodified)." GMT"; + if ($status) + $page['status'] = $status; return $page; }