diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays b/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays index 949187d..f9ebef7 100644 --- a/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays +++ b/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays @@ -37,6 +37,17 @@ foreach my $ibay ($a->get_all_by_prop(type => 'ibay')){ $display_errors = ($display_errors =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; $error_reporting = ($error_reporting eq 'E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT') ? '; default error_reporting' : "php_value[error_reporting] = $error_reporting"; $open_basedir = join(':', split(/[,;:]/, $open_basedir . $autoprepath)); + my $max_input_vars = (defined $ibay->prop('MaxInputVars'))? $ibay->prop('MaxInputVars') : $defaultPHPproperties{'MaxInputVars'} || '1000'; + my $short_open_tag = (defined $ibay->prop('ShortOpenTag'))? $ibay->prop('ShortOpenTag') : $defaultPHPproperties{'ShortOpenTag'} || 'On'; + my $sessionProb = (defined $ibay->prop('SessionProbability'))? $ibay->prop('SessionProbability') : $defaultPHPproperties{'SessionProbability'} || '1'; + my $max_children = (defined $ibay->prop('PHPmaxChildren'))? $ibay->prop('PHPmaxChildren') : $defaultPHPproperties{'PHPmaxChildren'} || 20; + my $min_spare_servers = (defined $ibay->prop('PHPminServers'))? $ibay->prop('PHPminServers') : $defaultPHPproperties{'PHPminServers'} || 4; + my $start_servers = (defined $ibay->prop('PHPstartServers'))? $ibay->prop('PHPstartServers') : $defaultPHPproperties{'PHPstartServers'} || 6; + my $max_spare_servers = (defined $ibay->prop('PHPmaxServers'))? $ibay->prop('PHPmaxServers') : $defaultPHPproperties{'PHPmaxServers'} || 8; + my $max_requests = (defined $ibay->prop('PHPmaxRequests'))? $ibay->prop('PHPmaxRequests') : $defaultPHPproperties{'PHPmaxRequests'} || 1000; + $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? sprintf("%.0f", $max_spare_servers/2) : $min_spare_servers; + $start_servers = ( $start_servers > $max_spare_servers ) ? sprintf("%.0f", $max_spare_servers/2 + $min_spare_servers/2 ) : $start_servers; + $OUT .=<<"_EOF" if ($version eq $PHP_VERSION); @@ -48,11 +59,11 @@ listen.group = www listen.mode = 0660 listen = /var/run/php-fpm/$pool_name.sock pm = dynamic -pm.max_children = 15 -pm.start_servers = 3 -pm.min_spare_servers = 3 -pm.max_spare_servers = 4 -pm.max_requests = 1000 +pm.max_children = $max_children +pm.start_servers = $start_servers +pm.min_spare_servers = $min_spare_servers +pm.max_spare_servers = $max_spare_servers +pm.max_requests = $max_requests $limitExtensions slowlog = /var/log/php/$key/slow.log php_admin_value[session.save_path] = /var/lib/php/$key/session @@ -77,6 +88,9 @@ php_admin_flag[allow_url_include] = off php_value[session.save_handler] = files php_admin_value[auto_prepend_file] = $autoprep php_admin_value[open_basedir] = $open_basedir +php_admin_value[max_input_vars] = $max_input_vars +php_admin_value[short_open_tag] = $short_open_tag +php_admin_value[session.gc_probability] = $sessionProb _EOF } diff --git a/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings16Session b/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings16Session index ebaa012..d456d4a 100644 --- a/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings16Session +++ b/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings16Session @@ -20,7 +20,7 @@ session.entropy_length = 0 session.entropy_file = session.cache_limiter = nocache session.cache_expire = 180 -session.use_trans_sid = On +session.use_trans_sid = {$phpcur->prop(SessionUseTransSid) || $php{SessionUseTransSid} || "On"} url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" session.use_strict_mode = Off session.sid_bits_per_character = 4 diff --git a/smeserver-php.spec b/smeserver-php.spec index 50ad386..38a6eae 100644 --- a/smeserver-php.spec +++ b/smeserver-php.spec @@ -1,5 +1,5 @@ %define version 11.0.0 -%define release 8 +%define release 9 %define name smeserver-php %global debug_package %{nil} @@ -189,7 +189,7 @@ Requires: php83-php, php83-php-enchant , php83-php-pdo php83-php-tidy , php83-p Manage PHP FPM pools, and switch between PHP versions easily %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}] %build perl createlinks @@ -281,6 +281,11 @@ rm -rf $RPM_BUILD_ROOT %preun %changelog +* Wed Oct 23 2024 John Crisp 11.0.0-9.sme +- add pm max_children, start_servers, min/max_spare_servers, max_requests [SME: 12729] +- add custom session.use trans_id [SME: 12651] +- add max_input_vars short_open_tag session.gc_probability [SME: 12499] + * Mon Apr 15 2024 Jean-Philippe Pialasse 11.0.0-8.sme - remove tar.xz from git