From cc74d0ddd03d45ada7df812565881ce8a1bce5bb Mon Sep 17 00:00:00 2001
From: acidvertigo <ldanzelmo@gmail.com>
Date: Mon, 25 Aug 2014 23:53:18 +0200
Subject: [PATCH 1/3] Fix for gzip content output properly

---
 catalog/includes/application_bottom.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog/includes/application_bottom.php b/catalog/includes/application_bottom.php
index 62135a09a..0e870e4b3 100644
--- a/catalog/includes/application_bottom.php
+++ b/catalog/includes/application_bottom.php
@@ -21,7 +21,7 @@
     }
   }
 
-  if ( (GZIP_COMPRESSION == 'true') && ($ext_zlib_loaded == true) && ($ini_zlib_output_compression < 1) ) {
+  if ( (GZIP_COMPRESSION == 'true') && (extension_loaded('zlib') == true) && (zlib.output_compression < 1) ) {
       tep_gzip_output(GZIP_LEVEL);
   }
 ?>

From fcb2da745fbf1a808a5da513838e2a4db8e63c49 Mon Sep 17 00:00:00 2001
From: acidvertigo <ldanzelmo@gmail.com>
Date: Tue, 26 Aug 2014 00:02:13 +0200
Subject: [PATCH 2/3] Update application_bottom.php

---
 catalog/includes/application_bottom.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog/includes/application_bottom.php b/catalog/includes/application_bottom.php
index 0e870e4b3..a220336ec 100644
--- a/catalog/includes/application_bottom.php
+++ b/catalog/includes/application_bottom.php
@@ -22,6 +22,6 @@
   }
 
   if ( (GZIP_COMPRESSION == 'true') && (extension_loaded('zlib') == true) && (zlib.output_compression < 1) ) {
-      tep_gzip_output(GZIP_LEVEL);
+    ob_end_flush();
   }
 ?>

From 2a8da3836e71b9517167ab543af16d1e22a2c18e Mon Sep 17 00:00:00 2001
From: acidvertigo <ldanzelmo@gmail.com>
Date: Tue, 26 Aug 2014 00:05:34 +0200
Subject: [PATCH 3/3] Remove old gzip compression function

---
 .../includes/functions/gzip_compression.php   | 47 -------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 catalog/includes/functions/gzip_compression.php

diff --git a/catalog/includes/functions/gzip_compression.php b/catalog/includes/functions/gzip_compression.php
deleted file mode 100644
index fe692e2dd..000000000
--- a/catalog/includes/functions/gzip_compression.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
-  $Id$
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2003 osCommerce
-
-  Released under the GNU General Public License
-*/
-
-  function tep_check_gzip() {
-    if (headers_sent() || connection_aborted()) {
-      return false;
-    }
-
-    if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'x-gzip') !== false) return 'x-gzip';
-
-    if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) return 'gzip';
-
-    return false;
-  }
-
-/* $level = compression level 0-9, 0=none, 9=max */
-  function tep_gzip_output($level = 5) {
-    if ($encoding = tep_check_gzip()) {
-      $contents = ob_get_contents();
-      ob_end_clean();
-
-      header('Content-Encoding: ' . $encoding);
-
-      $size = strlen($contents);
-      $crc = crc32($contents);
-
-      $contents = gzcompress($contents, $level);
-      $contents = substr($contents, 0, strlen($contents) - 4);
-
-      echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
-      echo $contents;
-      echo pack('V', $crc);
-      echo pack('V', $size);
-    } else {
-      ob_end_flush();
-    }
-  }
-?>