Compile: Move caching headers to file.inc.php

diff --git a/adminer/file.inc.php b/adminer/file.inc.php
index 25092131d66a6f141ac83c15360ec561f69d0ce4..706030a22e6a2a0dea344fc137a1707ba9977f33 100644 (file)
--- 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 229f4e38df918bd668d31494ae708eb97d6ea66e..7fd1e3be88007f456faae8633f71811af6ba1b4e 100755 (executable)
--- 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