diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2010-10-26 02:16:21 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2010-10-26 02:16:21 +0000 |
| commit | 0086bc8a96607d33f08e832282576dd62a152aae (patch) | |
| tree | ae13083baeb126c3991082e9763ce7358cd7344f /main/SAPI.c | |
| parent | 762a1b2d263bb612342733492dc0c67ebb79d6d6 (diff) | |
| download | php-git-0086bc8a96607d33f08e832282576dd62a152aae.tar.gz | |
- Implemented request #44164, zlib.output_compression is now implicitly
disabled when the header "Content-length" is set.
#One could argue that any output handler could change the size of the
#response, so this exception for zlib.output_compression is an
#inconsistency. However, zlib.output_compression is presented as a
#performance setting, whose value should have no effect on the
#correctness of the scripts. This was not the case. Setting the
#header "content-length" and enabling zlib.output_compression was
#a recipe for infringing section 4.4 of RFC 2616.
Diffstat (limited to 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 3e8abb2706..8593cd7d27 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -657,6 +657,14 @@ 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) && |