fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove gzip support; rely on webserver instead

Browse source
This commit is contained in:
Kijin Sung 2023-06-18 23:05:16 +09:00
parent de2a9288f2
commit e3ce2bcbcc
5 changed files with 3 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
classes/display/DisplayHandler.class.php
View file

@ -9,9 +9,8 @@ class DisplayHandler extends Handler
{ {
public static $response_size = 0; public static $response_size = 0;
public static $debug_printed = 0; public static $debug_printed = 0;
var $content_size = 0; // /< The size of displaying contents public $content_size = 0;
var $gz_enabled = FALSE; // / <a flog variable whether to call contents after compressing by gzip public $handler = NULL;
var $handler = NULL;
/** /**
* print either html or xml content given oModule object * print either html or xml content given oModule object
@ -21,12 +20,6 @@ class DisplayHandler extends Handler
*/ */
public function printContent(&$oModule) public function printContent(&$oModule)
{ {
// Check if the gzip encoding supported
if(config('view.use_gzip') && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && extension_loaded('zlib') && $oModule->gzhandler_enable)
{
$this->gz_enabled = TRUE;
}
// Extract contents to display by the response method // Extract contents to display by the response method
$responseMethod = Context::getResponseMethod(); $responseMethod = Context::getResponseMethod();
if(Context::get('xeVirtualRequestMethod') == 'xml') if(Context::get('xeVirtualRequestMethod') == 'xml')
@ -122,21 +115,11 @@ class DisplayHandler extends Handler
} }
} }
// disable gzip if output already exists // flush output buffer
while (ob_get_level()) while (ob_get_level())
{ {
ob_end_flush(); ob_end_flush();
} }
if(headers_sent())
{
$this->gz_enabled = FALSE;
}
// enable gzip using zlib extension
if($this->gz_enabled)
{
ini_set('zlib.output_compression', true);
}
// call a trigger after display // call a trigger after display
self::$response_size = $this->content_size = strlen($output); self::$response_size = $this->content_size = strlen($output);

1
common/defaults/config.php
View file

@ -80,7 +80,6 @@ return array(
'delay_compile' => 0, 'delay_compile' => 0,
'jquery_version' => 2, 'jquery_version' => 2,
'server_push' => false, 'server_push' => false,
'use_gzip' => false,
), ),
'admin' => array( 'admin' => array(
'allow' => array(), 'allow' => array(),

1
common/framework/parsers/ConfigParser.php
View file

@ -206,7 +206,6 @@ class ConfigParser
// Convert view configuration. // Convert view configuration.
$config['view']['minify_scripts'] = $db_info->minify_scripts ?: 'common'; $config['view']['minify_scripts'] = $db_info->minify_scripts ?: 'common';
$config['view']['use_gzip'] = (defined('__OB_GZHANDLER_ENABLE__') && constant('__OB_GZHANDLER_ENABLE__'));
// Convert admin IP whitelist. // Convert admin IP whitelist.
if (isset($db_info->admin_ip_list) && is_array($db_info->admin_ip_list) && count($db_info->admin_ip_list)) if (isset($db_info->admin_ip_list) && is_array($db_info->admin_ip_list) && count($db_info->admin_ip_list))

2
modules/admin/controllers/systemconfig/Advanced.php
View file

@ -108,7 +108,6 @@ class Advanced extends Base
Context::set('concat_scripts', Config::get('view.concat_scripts')); Context::set('concat_scripts', Config::get('view.concat_scripts'));
Context::set('jquery_version', Config::get('view.jquery_version')); Context::set('jquery_version', Config::get('view.jquery_version'));
Context::set('use_server_push', Config::get('view.server_push')); Context::set('use_server_push', Config::get('view.server_push'));
Context::set('use_gzip', Config::get('view.use_gzip'));
$this->setTemplateFile('config_advanced'); $this->setTemplateFile('config_advanced');
} }
@ -216,7 +215,6 @@ class Advanced extends Base
Config::set('view.delay_compile', intval($vars->delay_template_compile)); Config::set('view.delay_compile', intval($vars->delay_template_compile));
Config::set('view.jquery_version', $vars->jquery_version == 3 ? 3 : 2); Config::set('view.jquery_version', $vars->jquery_version == 3 ? 3 : 2);
Config::set('view.server_push', $vars->use_server_push === 'Y'); Config::set('view.server_push', $vars->use_server_push === 'Y');
Config::set('view.use_gzip', $vars->use_gzip === 'Y');
// Save // Save
if (!Config::save()) if (!Config::save())

9
modules/admin/tpl/config_advanced.html
View file

@ -239,15 +239,6 @@
<p class="x_help-block">{$lang->about_use_server_push}</p> <p class="x_help-block">{$lang->about_use_server_push}</p>
</div> </div>
</div> </div>
<div class="x_control-group">
<label class="x_control-label">{$lang->use_gzip}</label>
<div class="x_controls">
<label for="use_gzip_y" class="x_inline"><input type="radio" name="use_gzip" id="use_gzip_y" value="Y" checked="checked"|cond="$use_gzip" /> {$lang->cmd_yes}</label>
<label for="use_gzip_n" class="x_inline"><input type="radio" name="use_gzip" id="use_gzip_n" value="N" checked="checked"|cond="!$use_gzip" /> {$lang->cmd_no}</label>
<br />
<p class="x_help-block">{$lang->about_use_gzip}</p>
</div>
</div>
<div class="x_clearfix btnArea"> <div class="x_clearfix btnArea">
<div class="x_pull-right"> <div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button> <button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>