Commit 3f1ec019 authored by Lucien Gentis's avatar Lucien Gentis
Browse files

Rebuild.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1805630 13f79535-47bb-0310-9956-ffa450edef68
parent d0baaf2e
Loading
Loading
Loading
Loading
+2626 −2999

File changed.

Preview size limit exceeded, changes collapsed.

+14 −0
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@
<li><a href="mod_macro.html#macro" id="M" name="M">&lt;Macro&gt;</a></li>
<li><a href="mod_macro.html#macroignorebadnesting">MacroIgnoreBadNesting</a></li>
<li><a href="mod_macro.html#macroignoreemptyargs">MacroIgnoreEmptyArgs</a></li>
<li><a href="mod_md.html#manageddomain">ManagedDomain</a></li>
<li><a href="mod_md.html#manageddomain">&lt;ManagedDomain&gt;</a></li>
<li><a href="mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></li>
<li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
<li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
@@ -447,6 +449,15 @@
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
<li><a href="mod_md.html#mdcachallenges">MDCAChallenges</a></li>
<li><a href="mod_md.html#mdcertificateagreement">MDCertificateAgreement</a></li>
<li><a href="mod_md.html#mdcertificateauthority">MDCertificateAuthority</a></li>
<li><a href="mod_md.html#mdcertificateprotocol">MDCertificateProtocol</a></li>
<li><a href="mod_md.html#mddrivemode">MDDriveMode</a></li>
<li><a href="mod_md.html#mdmember">MDMember</a></li>
<li><a href="mod_md.html#mdportmap">MDPortMap</a></li>
<li><a href="mod_md.html#mdrenewwindow">MDRenewWindow</a></li>
<li><a href="mod_md.html#mdstoredir">MDStoreDir</a></li>
<li><a href="mod_socache_memcache.html#memcacheconnttl">MemcacheConnTTL</a></li>
<li><a href="core.html#mergetrailers">MergeTrailers</a></li>
<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
@@ -675,6 +686,8 @@
<li><a href="mod_ssl.html#sslopensslconfcmd">SSLOpenSSLConfCmd</a></li>
<li><a href="mod_ssl.html#ssloptions">SSLOptions</a></li>
<li><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog</a></li>
<li><a href="mod_ssl.html#sslpolicy">&lt;SSLPolicy&gt;</a></li>
<li><a href="mod_ssl.html#sslpolicy">SSLPolicy</a></li>
<li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
<li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
<li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
@@ -689,6 +702,7 @@
<li><a href="mod_ssl.html#sslproxymachinecertificatechainfile">SSLProxyMachineCertificateChainFile</a></li>
<li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
<li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
<li><a href="mod_ssl.html#sslproxypolicy">SSLProxyPolicy</a></li>
<li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>
<li><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify</a></li>
<li><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth</a></li>
+45 −57
Original line number Diff line number Diff line
@@ -355,50 +355,44 @@ propose le MPM <code class="module"><a href="../mod/worker.html">worker</a></cod
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="asyncrequestworkerfactor" id="asyncrequestworkerfactor">Directive</a> <a name="AsyncRequestWorkerFactor" id="AsyncRequestWorkerFactor">AsyncRequestWorkerFactor</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limite le nombre de connexions simultanes par thread</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AsyncRequestWorkerFactor <var>facteur</var></code></td></tr>
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limit concurrent connections per process</td></tr>
<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>AsyncRequestWorkerFactor <var>factor</var></code></td></tr>
<tr><th><a href="directive-dict.html#Default">Dfaut:</a></th><td><code>2</code></td></tr>
<tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
<tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>MPM</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>event</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibilit:</a></th><td>Disponible depuis la version 2.3.13</td></tr>
<tr><th><a href="directive-dict.html#Compatibility">Compatibilit:</a></th><td>Available in version 2.3.13 and later</td></tr>
</table>
    <p>Le MPM event gre certaines connexions de manire asynchrone ;
    dans ce cas, les threads traitant la requte sont allous selon les
    besoins et pour de courtes priodes. Dans les autres cas, un
    thread est rserv par
    connexion. Ceci peut conduire  des situations o tous les threads
    sont saturs et o aucun thread n'est capable d'effectuer de
    nouvelles tches pour les connexions asynchrones tablies.</p>

    <p>Pour minimiser les effets de ce problme, le MPM event utilise
    deux mthodes :</p>
    <p>The event MPM handles some connections in an asynchronous way, where
    request worker threads are only allocated for short periods of time as
    needed, and other connections with one request worker thread reserved per
    connection. This can lead to situations where all workers are tied up and
    no worker thread is available to handle new work on established async
    connections.</p>

    <p>To mitigate this problem, the event MPM does two things:</p>
    <ul>
    	<li>il limite le nombre de connexions
	    simultanes par thread en fonction du nombre de processus
	    inactifs;</li>
	<li>si tous les processus sont occups, il ferme des connexions
	permanentes, mme si la limite de dure de la connexion n'a
	pas t atteinte. Ceci autorise les clients
	concerns  se reconnecter  un autre processus
	possdant encore des threads disponibles.</li>
        <li>it limits the number of connections accepted per process, depending on the
            number of idle request workers;</li>
        <li>if all workers are busy, it will
            close connections in keep-alive state even if the keep-alive timeout has
            not expired. This allows the respective clients to reconnect to a
            different process which may still have worker threads available.</li>
    </ul>

    <p>Cette directive permet de personnaliser finement la limite du
    nombre de connexions par thread. Un <strong>processus</strong> n'acceptera de
    nouvelles connexions que si le nombre actuel de connexions (sans
    compter les connexions  l'tat "closing") est
    infrieur  :</p>
    <p>This directive can be used to fine-tune the per-process connection
    limit. A <strong>process</strong> will only accept new connections if the current number of
    connections (not counting connections in the "closing" state) is lower
    than:</p>

    <p class="indent"><strong>
        <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> +
        (<code class="directive">AsyncRequestWorkerFactor</code> *
        <var>nombre de threads inactifs</var>)
        <var>number of idle workers</var>)
    </strong></p>

    <p>Il est possible d'effectuer une estimation du nombre maximum de
    connexions simultanes pour tous les processus et pour un nombre donn moyen
    de threads de travail inactifs comme suit :
    <p>An estimation of the maximum concurrent connections across all the processes given
        an average value of idle worker threads can be calculated with:
    </p>


@@ -409,41 +403,41 @@ propose le MPM <code class="module"><a href="../mod/worker.html">worker</a></cod
        <code class="directive"><a href="../mod/mpm_common.html#serverlimit">ServerLimit</a></code>
    </strong></p>

    <div class="note"><h3>Exemple</h3>
    <div class="note"><h3>Example</h3>
    <pre class="prettyprint lang-config">ThreadsPerChild = 10
ServerLimit = 4
AsyncRequestWorkerFactor = 2
MaxRequestWorkers = 40

idle_workers = 4 (moyenne pour tous les processus pour faire simple)
idle_workers = 4 (average for all the processes to keep it simple)

max_connections = (ThreadsPerChild + (AsyncRequestWorkerFactor * idle_workers)) * ServerLimit
                = (10 + (2 * 4)) * 4 = 72</pre>

    </div>

    <p>Lorsque tous les threads de travail sont inactifs, le nombre maximum
    absolu de connexions simultanes peut tre calcul de manire plus simple :</p>
    <p>When all the worker threads are idle, then absolute maximum numbers of concurrent
        connections can be calculared in a simpler way:</p>

    <p class="indent"><strong>
        (<code class="directive">AsyncRequestWorkerFactor</code> + 1) *
        <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code>
    </strong></p>

    <div class="note"><h3>Exemple</h3>

    <div class="note"><h3>Example</h3>
    <pre class="prettyprint lang-config">ThreadsPerChild = 10
ServerLimit = 4
MaxRequestWorkers = 40
AsyncRequestWorkerFactor = 2</pre>


    <p>Si tous les threads de tous les processus sont inactifs, alors :</p>
    <p>If all the processes have all threads idle then: </p>

    <pre class="prettyprint lang-config">idle_workers = 10</pre>


    <p>Nous pouvons calculer le nombre maximum absolu de connexions simultanes
    de deux manires :</p>
    <p>We can calculate the absolute maximum numbers of concurrent connections in two ways:</p>

    <pre class="prettyprint lang-config">max_connections = (ThreadsPerChild + (AsyncRequestWorkerFactor * idle_workers)) * ServerLimit
                = (10 + (2 * 10)) * 4 = 120
@@ -453,20 +447,14 @@ max_connections = (AsyncRequestWorkerFactor + 1) * MaxRequestWorkers

    </div>

    <p>Le rglage de la directive
    <code class="directive">AsyncRequestWorkerFactor</code> ncessite de connatre le
    trafic gr par httpd pour chaque style d'utilisation spcifique ; si vous
    modifiez la valeur par dfaut, vous devrez par consquent effectuer des
    tests approfondis en vous appuyant troitement sur les donnes fournies par
    <code class="module"><a href="../mod/mod_status.html">mod_status</a></code>.</p>
    <p>Tuning <code class="directive">AsyncRequestWorkerFactor</code> requires knowledge about the traffic handled by httpd in each specific use case, so changing the default value requires extensive testing and data gathering from <code class="module"><a href="../mod/mod_status.html">mod_status</a></code>.</p>

    <p>La directive <code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> se nommait
    <code class="directive">MaxClients</code> avant la version 2.3.13. La valeur
    ci-dessus montre que cet ancien nom ne correspondait pas  sa
    signification exacte pour le MPM event.</p>
    <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestworkers">MaxRequestWorkers</a></code> was called
    <code class="directive">MaxClients</code> prior to version 2.3.13. The above value
    shows that the old name did not accurately describe its meaning for the event MPM.</p>

    <p>La directive <code class="directive">AsyncRequestWorkerFactor</code>
    accepte des valeurs d'argument de type non entier, comme "1.5".</p>
    <p><code class="directive">AsyncRequestWorkerFactor</code> can take non-integer
    arguments, e.g "1.5".</p>


</div>
+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,9 @@ chaque requ
traitement des requtes httpd</dd>
<dt><a href="mod_macro.html" id="M" name="M">mod_macro</a></dt><dd>Ce module permet d'utiliser des macros dans les fichiers
de configuration Apache.</dd>
<dt><a href="mod_md.html">mod_md</a></dt><dd>Managing domains across virtual hosts, certificate provisioning 
        via the ACME protocol
    </dd>
<dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associe les extensions des fichiers demands avec l'action
dclenche par ces fichiers et avec leur contenu (type MIME, langage,
jeu de caractre et codage)</dd>
+204 −223

File changed.

Preview size limit exceeded, changes collapsed.

Loading