From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 16 Mar 2025 16:16:23 +0000 (+0100)
Subject: Compile: Move caching headers to file.inc.php
X-Git-Tag: v5.0.6~30
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=529197f403fe88e639b40eac6bc1f521251eb8fa;p=adminer.git

Compile: Move caching headers to file.inc.php
---

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index 25092131..706030a2 100644
--- a/adminer/file.inc.php
+++ b/adminer/file.inc.php
@@ -1,8 +1,15 @@
 <?php
 namespace Adminer;
 
-// this is matched by compile.php
-// caching headers added in compile.php
+if (substr($VERSION, -4) != '-dev') {
+	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");
+}
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
diff --git a/compile.php b/compile.php
index 229f4e38..7fd1e3be 100755
--- a/compile.php
+++ b/compile.php
@@ -37,27 +37,12 @@ function lang_ids($match) {
 }
 
 function put_file($match) {
-	global $project, $VERSION, $driver;
+	global $project, $driver;
 	if (basename($match[2]) == '$LANG.inc.php') {
 		return $match[0]; // processed later
 	}
 	$return = file_get_contents(__DIR__ . "/$project/$match[2]");
 	$return = preg_replace('~namespace Adminer;\s*~', '', $return);
-	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 ($driver && preg_match('~/drivers/~', $match[2])) {
 		$return = preg_replace('~^if \(isset\(\$_GET\["' . $driver . '"]\)\) \{(.*)^}~ms', '\1', $return);
 		// check function definition in drivers