diff options
| author | Michal Čihař <mcihar@suse.cz> | 2011-08-04 16:36:01 +0400 |
|---|---|---|
| committer | Michal Čihař <mcihar@suse.cz> | 2011-08-04 16:36:01 +0400 |
| commit | 6196970dc26de011646a581044dbf05d95400c67 (patch) | |
| tree | 05e43ef425a7e5bb981d26c2f222317920fc0386 | |
| parent | 2283b016bb597ab70e557ae0f2ac18c64b473faa (diff) | |
Use new function for no cache headers
| -rw-r--r-- | import_status.php | 3 | ||||
| -rw-r--r-- | show_config_errors.php | 5 | ||||
| -rw-r--r-- | tbl_get_field.php | 10 |
3 files changed, 2 insertions, 16 deletions
diff --git a/import_status.php b/import_status.php index 7c77e31f86..75a336104f 100644 --- a/import_status.php +++ b/import_status.php @@ -9,8 +9,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/display_import_ajax.lib.php'; // AJAX requests can't be cached! -header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 -header("Expires: Sat, 11 Jan 1991 06:30:00 GMT"); // Date in the past +PMA_no_cache_header(); // $GLOBALS["message"] is used for asking for an import message if (isset($GLOBALS["message"]) && $GLOBALS["message"]) { diff --git a/show_config_errors.php b/show_config_errors.php index 09a286f473..e163c426c5 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -7,10 +7,7 @@ */ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; -header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 -header('Last-Modified: ' . $GLOBALS['now']); -header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 -header('Pragma: no-cache'); // HTTP/1.0 +PMA_no_cache_header(); header('Content-Type: text/html; charset=utf-8'); require './libraries/vendor_config.php'; diff --git a/tbl_get_field.php b/tbl_get_field.php index 4d4540beb5..8c6c1639e9 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -38,15 +38,5 @@ if ($result === false) { @ini_set('url_rewriter.tags', ''); PMA_download_header($table . '-' . $transform_key . '.bin', PMA_detectMIME($result)); -if (PMA_USR_BROWSER_AGENT == 'IE') { - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); -} else { - header('Pragma: no-cache'); - // test case: exporting a database into a .gz file with Safari - // would produce files not having the current time - // (added this header for Safari but should not harm other browsers) - header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); -} echo $result; ?> |