nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #607896

Browse Source
This commit is contained in:
Alexander M. Turek
2002-10-03 17:29:39 +00:00
parent e9d249201c
commit e24b4abce0
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,9 +5,13 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-10-03 Alexander M. Turek <rabus@users.sourceforge.net>
* tbl_dump.php3, libraries/build_dump.lib.php3: Completed fix against
bug #607896, thanks to Lo<4C>c.
2002-10-02 Alexander M. Turek <rabus@users.sourceforge.net> 2002-10-02 Alexander M. Turek <rabus@users.sourceforge.net>
* header.inc.php3, header_prinview.inc.php3: Corrected value for the * 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. * lang/german-utf-8.inc.php3: Wrong $charset value.
2002-10-02 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-10-02 Lo<4C>c Chapeaux <lolo@phpheaven.net>

5
libraries/build_dump.lib.php3
View File

@@ -563,7 +563,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
// bufferized // bufferized
if (!empty($GLOBALS['ob_mode']) if (!empty($GLOBALS['ob_mode'])
&& (isset($GLOBALS['zip']) || isset($GLOBALS['bzip']) || isset($GLOBALS['gzip']))) { && (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 } // end while
mysql_free_result($result); mysql_free_result($result);

5
tbl_dump.php3
View File

@@ -173,17 +173,18 @@ else {
: 'application/octet-stream'; : 'application/octet-stream';
} }
$now = gmdate('D, d M Y H:i:s') . ' GMT';
// Send headers // Send headers
header('Content-Type: ' . $mime_type); header('Content-Type: ' . $mime_type);
header('Expires: ' . $now);
// lem9 & loic1: IE need specific headers // lem9 & loic1: IE need specific headers
if (PMA_USR_BROWSER_AGENT == 'IE') { if (PMA_USR_BROWSER_AGENT == 'IE') {
header('Content-Disposition: inline; filename="' . $filename . '.' . $ext . '"'); header('Content-Disposition: inline; filename="' . $filename . '.' . $ext . '"');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public'); header('Pragma: public');
} else { } else {
header('Content-Disposition: attachment; filename="' . $filename . '.' . $ext . '"'); header('Content-Disposition: attachment; filename="' . $filename . '.' . $ext . '"');
header('Expires: 0');
header('Pragma: no-cache'); header('Pragma: no-cache');
} }
} // end download } // end download