michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-22 12:10:28 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add Apache 2.4 MPM process limit directives

Browse Source 
Expose missing prefork, worker, and event MPM tuning directives under Apache Processes and Limits, including MaxRequestWorkers, ServerLimit, ThreadLimit, ThreadsPerChild, and spare-thread controls.

https://github.com/webmin/webmin/issues/1821
This commit is contained in:
Ilia Ross
2026-06-21 22:52:13 +02:00
parent d3be11911e
commit 3f48d37e7a
7 changed files with 122 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
apache/core.pl
View File

@@ -118,6 +118,19 @@ return &parse_opt("MaxClients", '^\d+$',
$text{'core_emaxconc'});
}
sub edit_MaxRequestWorkers
{
return (1,
$text{'core_maxconc'},
&opt_input($_[0]->{'value'}, "MaxRequestWorkers",
$text{'core_default'}, 4));
}
sub save_MaxRequestWorkers
{
return &parse_opt("MaxRequestWorkers", '^\d+$',
$text{'core_emaxconc'});
}
sub edit_MaxKeepAliveRequests
{
return (1,
@@ -178,6 +191,66 @@ return &parse_opt("StartServers", '^\d+$',
$text{'core_einitial'});
}
sub edit_ServerLimit
{
return (1,
$text{'core_serverlimit'},
&opt_input($_[0]->{'value'}, "ServerLimit", $text{'core_default'}, 4));
}
sub save_ServerLimit
{
return &parse_opt("ServerLimit", '^\d+$',
$text{'core_eserverlimit'});
}
sub edit_MinSpareThreads
{
return (1,
$text{'worker_minspare'},
&opt_input($_[0]->{'value'},"MinSpareThreads",$text{'core_default'}, 4));
}
sub save_MinSpareThreads
{
return &parse_opt("MinSpareThreads", '^\d+$',
$text{'worker_eminspare'});
}
sub edit_MaxSpareThreads
{
return (1,
$text{'worker_maxspare'},
&opt_input($_[0]->{'value'},"MaxSpareThreads",$text{'core_default'}, 4));
}
sub save_MaxSpareThreads
{
return &parse_opt("MaxSpareThreads", '^\d+$',
$text{'worker_emaxspare'});
}
sub edit_ThreadLimit
{
return (1,
$text{'worker_threadlimit'},
&opt_input($_[0]->{'value'},"ThreadLimit",$text{'core_default'}, 4));
}
sub save_ThreadLimit
{
return &parse_opt("ThreadLimit", '^\d+$',
$text{'worker_ethreadlimit'});
}
sub edit_ThreadsPerChild
{
return (1,
$text{'worker_threads'},
&opt_input($_[0]->{'value'},"ThreadsPerChild",$text{'core_default'}, 4));
}
sub save_ThreadsPerChild
{
return &parse_opt("ThreadsPerChild", '^\d+$',
$text{'worker_ethreads'});
}
sub edit_RLimitCPU
{
return &rlimit_input("RLimitCPU", $text{'core_cpulimit'}, $_[0]);

8
apache/lang/en
View File

@@ -346,13 +346,15 @@ core_maxkeep=Maximum keepalives per connection
core_maxreq=Maximum requests per server process
core_minspare=Minimum spare server processes
core_maxspare=Maximum spare server processes
core_initial=Initial server processes
core_initial=Server processes at startup
core_serverlimit=Server process limit
core_emaxconc=Maximum concurrent requests must be an integer
core_emaxkeep=Maximum keepalives per connection must be an integer
core_emaxreq=Maximum requests per server process must be an integer
core_eminspare=Minimum spare server processes must be an integer
core_emaxspare=Maximum spare server processes must be an integer
core_einitial=Initial server processes must be an integer
core_einitial=Server processes at startup must be an integer
core_eserverlimit=Server process limit must be an integer
core_default=Default
core_cpulimit=CPU resource limit
core_memlimit=Memory resource limit
@@ -1064,6 +1066,8 @@ worker_eminspare=Minimum spare threads must be an integer
worker_emaxspare=Maximum spare threads must be an integer
worker_threads=Threads per child process
worker_ethreads=Number of threads per child process must be an integer
worker_threadlimit=Thread limit per child process
worker_ethreadlimit=Thread limit per child process must be an integer
perchild_sthreads=Initial threads per child process
perchild_esthreads=Number of threads per child process must be an integer

10
apache/mod_mpm_event.pl
View File

@@ -1,5 +1,5 @@
# mod_mpm_event.pl
# Defines editors for the pre-forking module in apache 2.4.
# Defines editors for the event MPM module in apache 2.4.
# The actual functions for all of these are still in core.pl
sub mod_mpm_event_directives
@@ -9,13 +9,17 @@ $rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
[ 'LockFile', 0, 9, 'global', 2.0 ],
[ 'MaxRequestWorkers', 0, 0, 'global', 2.313 ],
[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
[ 'MinSpareServers', 0, 0, 'global', 2.0 ],
[ 'MaxSpareServers', 0, 0, 'global', 2.0 ],
[ 'MinSpareThreads', 0, 0, 'global', 2.0 ],
[ 'MaxSpareThreads', 0, 0, 'global', 2.0 ],
[ 'PidFile', 0, 9, 'global', 2.0 ],
[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
[ 'ServerLimit', 0, 0, 'global', 2.0 ],
[ 'StartServers', 0, 0, 'global', 2.0 ],
[ 'ThreadLimit', 0, 0, 'global', 2.0 ],
[ 'ThreadsPerChild', 0, 0, 'global', 2.0 ],
[ 'Group', 0, 8, 'global', 2.0 ],
[ 'User', 0, 8, 'global', 2.0, 10 ] ];
return &make_directives($rv, $_[0], "mod_mpm_event");

2
apache/mod_mpm_prefork.pl
View File

@@ -9,12 +9,14 @@ $rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
[ 'LockFile', 0, 9, 'global', 2.0 ],
[ 'MaxRequestWorkers', 0, 0, 'global', 2.313 ],
[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
[ 'MinSpareServers', 0, 0, 'global', 2.0 ],
[ 'MaxSpareServers', 0, 0, 'global', 2.0 ],
[ 'PidFile', 0, 9, 'global', 2.0 ],
[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
[ 'ServerLimit', 0, 0, 'global', 2.0 ],
[ 'StartServers', 0, 0, 'global', 2.0 ],
[ 'Group', 0, 8, 'global', 2.0 ],
[ 'User', 0, 8, 'global', 2.0, 10 ] ];

27
apache/mod_mpm_worker.pl Normal file
View File

@@ -0,0 +1,27 @@
# mod_mpm_worker.pl
# Defines editors for the worker MPM module in apache 2.4.
# The actual functions for all of these are still in core.pl
sub mod_mpm_worker_directives
{
local $rv;
$rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
[ 'LockFile', 0, 9, 'global', 2.0 ],
[ 'MaxRequestWorkers', 0, 0, 'global', 2.313 ],
[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
[ 'MinSpareThreads', 0, 0, 'global', 2.0 ],
[ 'MaxSpareThreads', 0, 0, 'global', 2.0 ],
[ 'PidFile', 0, 9, 'global', 2.0 ],
[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
[ 'ServerLimit', 0, 0, 'global', 2.0 ],
[ 'StartServers', 0, 0, 'global', 2.0 ],
[ 'ThreadLimit', 0, 0, 'global', 2.0 ],
[ 'ThreadsPerChild', 0, 0, 'global', 2.0 ],
[ 'Group', 0, 8, 'global', 2.0 ],
[ 'User', 0, 8, 'global', 2.0, 10 ] ];
return &make_directives($rv, $_[0], "mod_mpm_worker");
}

3
apache/prefork.pl
View File

@@ -9,12 +9,15 @@ $rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
[ 'LockFile', 0, 9, 'global', 2.0 ],
[ 'MaxClients', 0, 0, 'global', '2.0-2.313' ],
[ 'MaxRequestWorkers', 0, 0, 'global', 2.313 ],
[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
[ 'MinSpareServers', 0, 0, 'global', 2.0 ],
[ 'MaxSpareServers', 0, 0, 'global', 2.0 ],
[ 'PidFile', 0, 9, 'global', 2.0 ],
[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
[ 'ServerLimit', 0, 0, 'global', 2.0 ],
[ 'StartServers', 0, 0, 'global', 2.0 ],
[ 'Group', 0, 8, 'global', 2.0 ],
[ 'User', 0, 8, 'global', 2.0, 10 ] ];

5
apache/worker.pl
View File

@@ -9,14 +9,17 @@ $rv = [ [ 'CoreDumpDirectory', 0, 9, 'global', 2.0 ],
[ 'BindAddress Listen Port', 1, 1, 'global', 2.0, 10 ],
[ 'ListenBacklog', 0, 1, 'global', 2.0 ],
[ 'LockFile', 0, 9, 'global', 2.0 ],
[ 'MaxClients', 0, 0, 'global', 2.0 ],
[ 'MaxClients', 0, 0, 'global', '2.0-2.313' ],
[ 'MaxRequestWorkers', 0, 0, 'global', 2.313 ],
[ 'MaxRequestsPerChild', 0, 0, 'global', 2.0 ],
[ 'MinSpareThreads', 0, 0, 'global', 2.0 ],
[ 'MaxSpareThreads', 0, 0, 'global', 2.0 ],
[ 'PidFile', 0, 9, 'global', 2.0 ],
[ 'ScoreBoardFile', 0, 9, 'global', 2.0 ],
[ 'SendBufferSize', 0, 1, 'global', 2.0 ],
[ 'ServerLimit', 0, 0, 'global', 2.0 ],
[ 'StartServers', 0, 0, 'global', 2.0 ],
[ 'ThreadLimit', 0, 0, 'global', 2.0 ],
[ 'ThreadsPerChild', 0, 0, 'global', 2.0 ],
[ 'Group', 0, 8, 'global', 2.0 ],
[ 'User', 0, 8, 'global', 2.0, 10 ] ];