From db02f146724d796b0988ccc9ffe3cf6844ac0b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Sun, 23 Jan 2005 23:24:33 +0000
Subject: [PATCH] Back to Content-Type application/x-bzip2 on bzip2 export (bug
 #1106652).

---
 ChangeLog  | 10 +++++++---
 export.php |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2560a602c..08a993cb7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $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>
     * libraries/sqlparser.data.php: Added some keywords.
 
@@ -35,13 +39,13 @@ $Source$
 
 2005-01-18 Marc Delisle  <lem9@users.sourceforge.net>
     * sql.php, libraries/common.lib.php, /display_tbl.lib.php, /functions.js,
-      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 
+      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
       go to the real end
       TODO: page number selector
     * common.lib.php: PMA_showHint(): now the lightbulb is clickable,
       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>
     * server_engines.php, server_links.php libraries/storage_engines.lib.php:
diff --git a/export.php b/export.php
index cc47d0ecc..1c9444eb7 100644
--- a/export.php
+++ b/export.php
@@ -238,10 +238,14 @@ if ($asfile) {
     $content_encoding = '';
     if (isset($compression) && $compression == 'bzip') {
         $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') {
         $filename  .= '.gz';
+        // needed to avoid recompression by server modules like mod_gzip:
         $content_encoding = 'x-gzip';
+        $mime_type = 'application/x-gzip';
     } else if (isset($compression) && $compression == 'zip') {
         $filename  .= '.zip';
         $mime_type = 'application/zip';