Accepting request 946161 from Apache
OBS-URL: https://build.opensuse.org/request/show/946161 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=191
This commit is contained in:
commit
712ca1fb52
@ -20,13 +20,13 @@
|
||||
MaxSpareServers 10
|
||||
# highest possible MaxRequestWorkers setting for the lifetime of the Apache process.
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#serverlimit
|
||||
ServerLimit 150
|
||||
ServerLimit 256
|
||||
# maximum number of server processes allowed to start (formerly MaxClients)
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers
|
||||
MaxRequestWorkers 150
|
||||
MaxRequestWorkers 256
|
||||
# maximum number of requests a server process serves
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestsperchild
|
||||
MaxRequestsPerChild 10000
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxconnectionsperchild
|
||||
MaxConnectionsPerChild 10000
|
||||
</IfModule>
|
||||
|
||||
# worker MPM
|
||||
@ -45,13 +45,13 @@
|
||||
ThreadLimit 64
|
||||
# maximum number of simultaneous client connections (formerly MaxClients)
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers
|
||||
MaxRequestWorkers 150
|
||||
MaxRequestWorkers 256
|
||||
# number of worker threads created by each child process
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#threadsperchild
|
||||
ThreadsPerChild 25
|
||||
# maximum number of requests a server process serves
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestsperchild
|
||||
MaxRequestsPerChild 10000
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxconnectionsperchild
|
||||
MaxConnectionsPerChild 10000
|
||||
</IfModule>
|
||||
|
||||
# event MPM
|
||||
@ -70,13 +70,13 @@
|
||||
ThreadLimit 64
|
||||
# maximum number of simultaneous client connections (formerly MaxClients)
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestworkers
|
||||
MaxRequestWorkers 150
|
||||
MaxRequestWorkers 256
|
||||
# number of worker threads created by each child process
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#threadsperchild
|
||||
ThreadsPerChild 25
|
||||
# maximum number of requests a server process serves
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxrequestsperchild
|
||||
MaxRequestsPerChild 10000
|
||||
# https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxconnectionsperchild
|
||||
MaxConnectionsPerChild 10000
|
||||
# limit concurrent connections per process
|
||||
# https://httpd.apache.org/docs/2.4/mod/event.html#asyncrequestworkerfactor
|
||||
AsyncRequestWorkerFactor 2
|
||||
|
@ -1,9 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 11 12:05:55 UTC 2022 - David Anes <david.anes@suse.com>
|
||||
|
||||
- Align some defaults in apache2-server-tuning.conf to upstream
|
||||
defaults:
|
||||
* Updated MaxRequestWorkers and ServerLimit to 256. [bsc#1194062]
|
||||
- The old name MaxRequestsPerChild is changed to MaxConnectionsPerChild.
|
||||
* See https://httpd.apache.org/docs/2.4/mod/mpm_common.html#maxconnectionsperchild
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 18:12:38 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Add apache2-perl-io-socket.patch: t/ssl/ocsp.t: Handle new error
|
||||
message raised by IO-Socket-SSL 2.073.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 16:16:16 UTC 2022 - olaf@aepfle.de
|
||||
|
||||
- remove instance units from post scripts, they can not be reloaded
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 20 11:26:49 UTC 2021 - David Anes <david.anes@suse.com>
|
||||
|
||||
|
10
apache2.spec
10
apache2.spec
@ -961,7 +961,7 @@ exit 0
|
||||
# main package scriptlets
|
||||
%if "%{flavor}" == ""
|
||||
%pre
|
||||
%service_add_pre apache2.service apache2@.service apache2.target
|
||||
%service_add_pre apache2.service apache2.target
|
||||
exit 0
|
||||
|
||||
%post
|
||||
@ -971,7 +971,7 @@ if grep -q "^wwwadmin:" %{_sysconfdir}/group; then
|
||||
usermod -g %{httpdgroup} %{httpduser} 2>/dev/null ||:
|
||||
usermod -s /bin/false %{httpduser} 2>/dev/null ||:
|
||||
fi
|
||||
%service_add_post apache2.service apache2@.service apache2.target
|
||||
%service_add_post apache2.service apache2.target
|
||||
%set_permissions %{_sbindir}/suexec || \
|
||||
echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec ."
|
||||
%{fillup_only apache2}
|
||||
@ -987,15 +987,15 @@ exit 0
|
||||
%verify_permissions -e %{_sbindir}/suexec
|
||||
|
||||
%preun
|
||||
%service_del_preun apache2.service apache2@.service apache2.target
|
||||
%service_del_preun apache2.service apache2.target
|
||||
exit 0
|
||||
|
||||
%postun
|
||||
%if %{defined service_del_postun_without_restart}
|
||||
%service_del_postun_without_restart apache2.service apache2@.service apache2.target
|
||||
%service_del_postun_without_restart apache2.service apache2.target
|
||||
%else
|
||||
DISABLE_RESTART_ON_UPDATE='yes'
|
||||
%service_del_postun apache2.service apache2@.service apache2.target
|
||||
%service_del_postun apache2.service apache2.target
|
||||
%endif
|
||||
if [ "$1" = 1 ]; then
|
||||
%apache_request_restart
|
||||
|
Loading…
Reference in New Issue
Block a user