[debian-edu-commits] debian-edu/pkg-team/ 03/04: debian/patches: Add 1020_ob-fixes.patch. Only run ob_end_clean() if there is something to clean.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit 466c98756a23328151aacecc8d488c83c422f8ba
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 19 13:17:09 2015 +0200

    debian/patches: Add 1020_ob-fixes.patch. Only run ob_end_clean() if there is something to clean.
---
 debian/patches/1020_ob-fixes.patch | 25 +++++++++++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/1020_ob-fixes.patch b/debian/patches/1020_ob-fixes.patch
new file mode 100644
index 0000000..54caedb
--- /dev/null
+++ b/debian/patches/1020_ob-fixes.patch
@@ -0,0 +1,25 @@
+Description: Only run ob_end_clean if there is something to clean
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+
+--- a/gosa-core/html/index.php
++++ b/gosa-core/html/index.php
+@@ -167,7 +167,7 @@
+ 
+ /* Enable compressed output */
+ if ($config->get_cfg_value("core","sendCompressedOutput") != "") {
+-    ob_end_clean();
++    if(ob_get_length() > 0) { ob_end_clean(); }
+     ob_start("ob_gzhandler");
+ }
+ 
+--- a/gosa-core/html/main.php
++++ b/gosa-core/html/main.php
+@@ -80,7 +80,7 @@
+ 
+ /* Enable compressed output */
+ if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){
+-  ob_end_clean();
++  if(ob_get_length() > 0) { ob_end_clean(); }
+   ob_start("ob_gzhandler");
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 97edc12..896864b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,6 +22,7 @@
 1017_get-ogroups-ou-fix.patch
 1018_no-item-multiplication-on-duplicate-search-results.patch
 1019_fix-various-typos.patch
+1020_ob-fixes.patch
 2001_fix-smarty-location.patch
 2002_fix-template-location.patch
 2003_fix-class-mapping.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git