Don't use ob_gzhandler if zlib output compression is enabled.

diff --git a/debian/changelog b/debian/changelog
index 2b5fb6e12f63c768bc1860736e1d9977753722e0..52082d8610daa79f0144d9e8790e43b2031e1396 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.1~rc2-2) unstable; urgency=low
+
+  * Fix a conflict between ob_gzhandler and zlib output compression,
+    thanks to kaouete (Closes: #450482).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Sat, 17 Nov 2007 09:13:03 +0100
+
 roundcube (0.1~rc2-1) unstable; urgency=low
 
   * New upstream, thanks to Nicolas Stransky (Closes: #447503). This

diff --git a/debian/patches/ob_gzhandler.patch b/debian/patches/ob_gzhandler.patch
new file mode 100644 (file)
index 0000000..4b2827c
--- /dev/null
+++ b/debian/patches/ob_gzhandler.patch
@@ -0,0 +1,11 @@
+--- roundcube/index.php        2007-10-29 21:56:00.000000000 +0100
++++ roundcube/index.php        2007-11-17 09:10:54.000000000 +0100
+@@ -103,7 +103,7 @@
+ if ($_action != 'get' && $_action != 'viewsource')
+ {
+   // use gzip compression if supported
+-  if (function_exists('ob_gzhandler') && ini_get('zlib.output_compression'))
++  if (function_exists('ob_gzhandler') && !ini_get('zlib.output_compression'))
+     ob_start('ob_gzhandler');
+   else
+     ob_start();

diff --git a/debian/patches/series b/debian/patches/series
index bde2b5d14a35881a9b76f3c332370638d2c95bd6..af70f214a05e099706c4ce115274c117311bf50c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 dbconfig-common_support.patch
 correct_install_path.patch
 use_packaged_tinymce.patch
+ob_gzhandler.patch