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

Back to Content-Type application/x-bzip2 on bzip2 export (bug #1106652).

Browse Source
This commit is contained in:
Michal Čihař
2005-01-23 23:24:33 +00:00
parent f696e57cba
commit db02f14672
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-01-24 Michal Čihař <michal@cihar.com>
* export.php: Back to Content-Type application/x-bzip2 on bzip2 export
(bug #1106652).
2005-01-23 Alexander M. Turek <me@derrabus.de> 2005-01-23 Alexander M. Turek <me@derrabus.de>
* libraries/sqlparser.data.php: Added some keywords. * libraries/sqlparser.data.php: Added some keywords.
@@ -35,13 +39,13 @@ $Source$
2005-01-18 Marc Delisle <lem9@users.sourceforge.net> 2005-01-18 Marc Delisle <lem9@users.sourceforge.net>
* sql.php, libraries/common.lib.php, /display_tbl.lib.php, /functions.js, * sql.php, libraries/common.lib.php, /display_tbl.lib.php, /functions.js,
lang/*.php: bug #1084820: ask a confirmation when a user wants to lang/*.php: bug #1084820: ask a confirmation when a user wants to
reach the End of rows, and count the exact number of rows to reach the End of rows, and count the exact number of rows to
go to the real end go to the real end
TODO: page number selector TODO: page number selector
* common.lib.php: PMA_showHint(): now the lightbulb is clickable, * common.lib.php: PMA_showHint(): now the lightbulb is clickable,
to reveal the full message for browsers who truncate it, to reveal the full message for browsers who truncate it,
thanks to Alexander for the suggestion thanks to Alexander for the suggestion
2005-01-18 Alexander M. Turek <me@derrabus.de> 2005-01-18 Alexander M. Turek <me@derrabus.de>
* server_engines.php, server_links.php libraries/storage_engines.lib.php: * server_engines.php, server_links.php libraries/storage_engines.lib.php:

6
export.php
View File

@@ -238,10 +238,14 @@ if ($asfile) {
$content_encoding = ''; $content_encoding = '';
if (isset($compression) && $compression == 'bzip') { if (isset($compression) && $compression == 'bzip') {
$filename .= '.bz2'; $filename .= '.bz2';
$content_encoding = 'x-bzip2'; // browsers don't like this:
//$content_encoding = 'x-bzip2';
$mime_type = 'application/x-bzip2';
} else if (isset($compression) && $compression == 'gzip') { } else if (isset($compression) && $compression == 'gzip') {
$filename .= '.gz'; $filename .= '.gz';
// needed to avoid recompression by server modules like mod_gzip:
$content_encoding = 'x-gzip'; $content_encoding = 'x-gzip';
$mime_type = 'application/x-gzip';
} else if (isset($compression) && $compression == 'zip') { } else if (isset($compression) && $compression == 'zip') {
$filename .= '.zip'; $filename .= '.zip';
$mime_type = 'application/zip'; $mime_type = 'application/zip';