From e0ef072bd05b00fea5a7eed09ca3aedda7786a10 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 22 Jul 2013 19:40:03 -0700
Subject: [PATCH] Keep form values after refresh in Firefox

---
 adminer/include/bootstrap.inc.php | 2 +-
 adminer/include/design.inc.php    | 1 +
 changes.txt                       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 085fda7d..b1a27ae6 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -36,6 +36,7 @@ if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { /
 $HTTPS = $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off");
 
 @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled
+session_cache_limiter(""); // to allow restarting session and to not send Cache-Control: no-store
 if (!defined("SID")) {
 	session_name("adminer_sid"); // use specific session name to get own namespace
 	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
@@ -83,7 +84,6 @@ include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
 
 if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
-	session_cache_limiter(""); // to allow restarting session
 	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
 }
 
diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index e82be4e2..7cfa0202 100644
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -81,6 +81,7 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
 function page_headers() {
 	global $adminer;
 	header("Content-Type: text/html; charset=utf-8");
+	header("Cache-Control: no-cache");
 	if ($adminer->headers()) {
 		header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox 3.6.9
 		header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
diff --git a/changes.txt b/changes.txt
index 456426db..1c80a911 100644
--- a/changes.txt
+++ b/changes.txt
@@ -9,6 +9,7 @@ Display number of selected rows
 Add links to documentation
 Disable underlining links
 Improve speed of CSV import
+Keep form values after refresh in Firefox
 Don't append newlines to uploaded files, bug since Adminer 3.7.0
 PostgreSQL: Fix handling of nextval() default values