diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2009-01-22 22:50:10 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2009-01-22 22:50:10 +0100 |
| commit | 98bda4fdc7bccbef714bd6480528804bcd3f5586 (patch) | |
| tree | 7f26270babd142e6024f2988e5c8f489dd483a49 /inc/init.php | |
| parent | d578eae7de9837d20a73ae2f83f7bf3d346d7ed5 (diff) | |
| download | rpg-98bda4fdc7bccbef714bd6480528804bcd3f5586.tar.gz rpg-98bda4fdc7bccbef714bd6480528804bcd3f5586.tar.bz2 | |
fixed multiple gzip/sendfile problems in css and js dispatchers FS#1571
- Avoid double compression when gzip_output is enabled
- Only compress when gzip_output is enabled
- Do not use x-sendfile for compressed content (content-encoding is not supported)
- Make sure the script terminates after using x-sendfile
- Moved gzip browser support check to init.php
darcs-hash:20090122215010-7ad00-765765d353ff78df5b8704086328c5c699bbe7e0.gz
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/init.php b/inc/init.php index 1d651812f..f577188e8 100644 --- a/inc/init.php +++ b/inc/init.php @@ -168,11 +168,11 @@ // increase PCRE backtrack limit @ini_set('pcre.backtrack_limit', '20971520'); - // enable gzip compression + // enable gzip compression if supported + $conf['gzip_output'] &= (strpos($_SERVER['HTTP_ACCEPT_ENCODING'],'gzip') !== false); if ($conf['gzip_output'] && !defined('DOKU_DISABLE_GZIP_OUTPUT') && - function_exists('ob_gzhandler') && - preg_match('/gzip|deflate/', $_SERVER['HTTP_ACCEPT_ENCODING'])) { + function_exists('ob_gzhandler')) { ob_start('ob_gzhandler'); } |