From a31f379367cfab9b184d0ae4409c6e6e74c1a3d7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?=
 <cataphract@php.net>
Date: Thu, 18 Nov 2010 04:09:02 +0000
Subject: [PATCH] - Reversed implementation of FR #44164, pending further
 consideration.   See rev #304903.

---
 NEWS                      |  2 --
 main/SAPI.c               |  8 --------
 tests/basic/req44164.phpt | 17 -----------------
 3 files changed, 27 deletions(-)
 delete mode 100644 tests/basic/req44164.phpt

diff --git a/NEWS b/NEWS
index 72680d963b..bd2ac98bb7 100644
--- a/NEWS
+++ b/NEWS
@@ -32,8 +32,6 @@
   for empty uploads and, in debug mode, 0-length uploads. (Gustavo)
 - Added a 3rd parameter to get_html_translation_table. It now takes a charset
   hint, like htmlentities et al. (Gustavo)
-- Implemented FR #44164, setting the header "Content-length" implicitly
-  disables zlib.output_compression.
 
 - Fixed a possible double free in imap extension (Identified by Mateusz 
   Kocielski). (CVE-2010-4150). (Ilia)
diff --git a/main/SAPI.c b/main/SAPI.c
index 4a1605b0c5..ca962b9970 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -657,14 +657,6 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC)
 				}
 				efree(mimetype);
 				SG(sapi_headers).send_default_content_type = 0;
-			} else if (!STRCASECMP(header_line, "Content-Length")) {
-				/* Script is setting Content-length. The script cannot reasonably
-				 * know the size of the message body after compression, so it's best
-				 * do disable compression altogether. This contributes to making scripts
-				 * portable between setups that have and don't have zlib compression
-				 * enabled globally. See req #44164 */
-				zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"),
-					"0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
 			} else if (!STRCASECMP(header_line, "Location")) {
 				if ((SG(sapi_headers).http_response_code < 300 ||
 					SG(sapi_headers).http_response_code > 307) &&
diff --git a/tests/basic/req44164.phpt b/tests/basic/req44164.phpt
deleted file mode 100644
index d0082861f2..0000000000
--- a/tests/basic/req44164.phpt
+++ /dev/null
@@ -1,17 +0,0 @@
---TEST--
-Req #44164 (Handle "Content-Length" HTTP header when zlib.output_compression active)
---SKIPIF--
-<?php
-if (!function_exists('gzdeflate'))
-    die("skip zlib extension required");
-?>
---INI--
-zlib.output_compression=On
---ENV--
-HTTP_ACCEPT_ENCODING=gzip
---FILE--
-<?php
-header("Content-length: 200");
-echo str_repeat("a", 200);
---EXPECT--
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-- 
2.40.0