diff --git a/ChangeLog b/ChangeLog index b39f6c75f..3dde51877 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,9 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-10-03 Alexander M. Turek + * tbl_dump.php3, libraries/build_dump.lib.php3: Completed fix against + bug #607896, thanks to Loïc. + 2002-10-02 Alexander M. Turek * header.inc.php3, header_prinview.inc.php3: Corrected value for the - 'Expires' HTTP header. + 'Expires' HTTP header (Fixed bug #607896). * lang/german-utf-8.inc.php3: Wrong $charset value. 2002-10-02 Loïc Chapeaux diff --git a/libraries/build_dump.lib.php3 b/libraries/build_dump.lib.php3 index 15ae15d71..b2b1da5ce 100644 --- a/libraries/build_dump.lib.php3 +++ b/libraries/build_dump.lib.php3 @@ -563,7 +563,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){ // bufferized if (!empty($GLOBALS['ob_mode']) && (isset($GLOBALS['zip']) || isset($GLOBALS['bzip']) || isset($GLOBALS['gzip']))) { - header('Expires: 0'); + if (!isset($GLOBALS['now']) { + $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; + } + header('Expires: ' . $GLOBALS['now']); } } // end while mysql_free_result($result); diff --git a/tbl_dump.php3 b/tbl_dump.php3 index 3b9cc3070..3a70ae7d8 100755 --- a/tbl_dump.php3 +++ b/tbl_dump.php3 @@ -173,17 +173,18 @@ else { : 'application/octet-stream'; } + $now = gmdate('D, d M Y H:i:s') . ' GMT'; + // Send headers header('Content-Type: ' . $mime_type); + header('Expires: ' . $now); // lem9 & loic1: IE need specific headers if (PMA_USR_BROWSER_AGENT == 'IE') { header('Content-Disposition: inline; filename="' . $filename . '.' . $ext . '"'); - header('Expires: 0'); header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); header('Pragma: public'); } else { header('Content-Disposition: attachment; filename="' . $filename . '.' . $ext . '"'); - header('Expires: 0'); header('Pragma: no-cache'); } } // end download