From 2312035f9b28b799d87bd86757dd1a281796fc068586479ad04547ff9c2dcfec Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 11 Jan 2022 07:57:05 +0000 Subject: [PATCH 1/2] Accepting request 945375 from home:olh:branches:Apache - remove instance units from post scripts, they can not be reloaded OBS-URL: https://build.opensuse.org/request/show/945375 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=664 --- apache2.changes | 5 +++++ apache2.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apache2.changes b/apache2.changes index c2a7e21..7f4e753 100644 --- a/apache2.changes +++ b/apache2.changes @@ -4,6 +4,11 @@ Mon Jan 10 18:12:38 UTC 2022 - Dominique Leuenberger - 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 diff --git a/apache2.spec b/apache2.spec index fb4b16d..27c3a16 100644 --- a/apache2.spec +++ b/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 From 87eb553b4af87767ed098e9412edca961096ecebf315475d39f8d729b332e82a Mon Sep 17 00:00:00 2001 From: David Anes Date: Thu, 13 Jan 2022 14:19:25 +0000 Subject: [PATCH 2/2] Accepting request 945607 from home:david.anes:branches:Apache Fix bsc#1194062 by using default upstream values for ServerLimit and MaxConnectionsPerChild OBS-URL: https://build.opensuse.org/request/show/945607 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=665 --- apache2-server-tuning.conf | 20 ++++++++++---------- apache2.changes | 9 +++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/apache2-server-tuning.conf b/apache2-server-tuning.conf index 42fa8db..b0a7be0 100644 --- a/apache2-server-tuning.conf +++ b/apache2-server-tuning.conf @@ -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 # 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 # 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 diff --git a/apache2.changes b/apache2.changes index 7f4e753..35d1a70 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jan 11 12:05:55 UTC 2022 - David Anes + +- 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