diff options
| author | Stefan Fritsch <sf@debian.org> | 2011-02-06 14:54:53 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:37:11 +0100 |
| commit | 0ea7e1a472a4dadfd5bb48b75dddfdd9003cab85 (patch) | |
| tree | ad1869b5164fda768ae92232e2c752a16ebeef8f | |
| parent | e171cb659a91468b117179023c39d35229da07a5 (diff) | |
| download | apache2-0ea7e1a472a4dadfd5bb48b75dddfdd9003cab85.tar.gz | |
* Fix order of comments in "worker" section in apache2.conf. Closes: #608488
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1271 01b336ce-410b-0410-9a02-a0e7f243c266
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/config-dir/apache2.conf | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 2498e605..75ece0af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apache2 (2.2.17-1) UNRELEASED; urgency=low * New upstream version + * Fix order of comments in "worker" section in apache2.conf. Closes: #608488 -- Stefan Fritsch <sf@debian.org> Sun, 06 Feb 2011 15:23:35 +0100 diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf index 1e97b4eb..7fefda2d 100644 --- a/debian/config-dir/apache2.conf +++ b/debian/config-dir/apache2.conf @@ -105,13 +105,13 @@ KeepAliveTimeout 15 # worker MPM # StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections # MinSpareThreads: minimum number of worker threads which are kept spare # MaxSpareThreads: maximum number of worker threads which are kept spare # ThreadLimit: ThreadsPerChild can be changed to this maximum value during a # graceful restart. ThreadLimit can only be changed by stopping # and starting Apache. # ThreadsPerChild: constant number of worker threads in each server process +# MaxClients: maximum number of simultaneous client connections # MaxRequestsPerChild: maximum number of requests a server process serves <IfModule mpm_worker_module> StartServers 2 @@ -125,18 +125,18 @@ KeepAliveTimeout 15 # event MPM # StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections # MinSpareThreads: minimum number of worker threads which are kept spare # MaxSpareThreads: maximum number of worker threads which are kept spare # ThreadsPerChild: constant number of worker threads in each server process +# MaxClients: maximum number of simultaneous client connections # MaxRequestsPerChild: maximum number of requests a server process serves <IfModule mpm_event_module> StartServers 2 - MaxClients 150 MinSpareThreads 25 MaxSpareThreads 75 ThreadLimit 64 ThreadsPerChild 25 + MaxClients 150 MaxRequestsPerChild 0 </IfModule> |