From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 20 Feb 2018 21:08:52 +0000 (+0100)
Subject: Use file caching only in non-dev
X-Git-Tag: v4.6.3~66
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=6ebbd8c71950ae408aab134f1982dfb22af1f186;p=adminer.git

Use file caching only in non-dev
---

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index c2d53d98..8c817697 100644
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -1,13 +1,5 @@
 <?php
-//! rewrite in compile.php to cache moderately with -dev version
-if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
-	header("HTTP/1.1 304 Not Modified");
-	exit;
-}
-
-header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: immutable");
+// caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
diff --git a/compile.php b/compile.php
index 9390540d..0f00b779 100755
--- a/compile.php
+++ b/compile.php
@@ -36,11 +36,26 @@ function lang_ids($match) {
 }
 
 function put_file($match) {
-	global $project;
+	global $project, $VERSION;
 	if (basename($match[2]) == '$LANG.inc.php') {
 		return $match[0]; // processed later
 	}
 	$return = file_get_contents(dirname(__FILE__) . "/$project/$match[2]");
+	if (basename($match[2]) == "file.inc.php") {
+		$return = str_replace("\n// caching headers added in compile.php", (preg_match('~-dev$~', $VERSION) ? '' : '
+if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
+	header("HTTP/1.1 304 Not Modified");
+	exit;
+}
+
+header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
+header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: immutable");
+'), $return, $count);
+		if (!$count) {
+			echo "adminer/file.inc.php: Caching headers placeholder not found\n";
+		}
+	}
 	if (basename($match[2]) != "lang.inc.php" || !$_SESSION["lang"]) {
 		if (basename($match[2]) == "lang.inc.php") {
 			$return = str_replace('function lang($idf, $number = null) {', 'function lang($idf, $number = null) {