Don't double encode gzip output if gzip is already set in php.ini. Props
welcomb. fixes #4205 git-svn-id: http://svn.automattic.com/wordpress/trunk@5333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
05996c589f
commit
638337cf4a
|
@ -84,7 +84,7 @@
|
||||||
if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
|
if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
|
||||||
$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
|
$encodings = explode(',', strtolower(preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_ENCODING'])));
|
||||||
|
|
||||||
if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression')) {
|
if ((in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------'])) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') && ini_get('output_handler') != 'ob_gzhandler') {
|
||||||
$enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
|
$enc = in_array('x-gzip', $encodings) ? "x-gzip" : "gzip";
|
||||||
$supportsGzip = true;
|
$supportsGzip = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue