From: Joshua Slive Date: Fri, 30 Aug 2002 17:09:23 +0000 (+0000) Subject: Update the defaults on ThreadsPerChild and ThreadLimit and not that X-Git-Tag: AGB_BEFORE_AAA_CHANGES~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39556af887418f4ee844f06e26cf71eee124fde;p=thirdparty%2Fapache%2Fhttpd.git Update the defaults on ThreadsPerChild and ThreadLimit and not that ThreadLimit is now part of mpm_winnt as well as update a few transformations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96591 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/directives.html.ja.jis b/docs/manual/mod/directives.html.ja.jis index 3c104fae563..3b5bfc64244 100644 --- a/docs/manual/mod/directives.html.ja.jis +++ b/docs/manual/mod/directives.html.ja.jis @@ -8,4 +8,4 @@ これらは一貫した形式で書かれていて、使われている用語の 用語集 も用意されています。

-

Apache HTTP Server Version 2.0

索引ホーム \ No newline at end of file +

Apache HTTP Server Version 2.0

索引ホーム \ No newline at end of file diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 0d1d7126470..76eee96b752 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -1534,13 +1534,14 @@ There is a special feature: information from URLs.
  • - 'cookie|CO=NAME:VAL:domain[:lifetime]' + 'cookie|CO=NAME:VAL:domain[:lifetime[:path]]' (set cocookie)
    This sets a cookie on the client's browser. The cookie's name is specified by NAME and the value is VAL. The domain field is the domain of the - cookie, such as '.apache.org' and the optional lifetime - is the lifetime of the cookie in minutes.
    • + cookie, such as '.apache.org',the optional lifetime + is the lifetime of the cookie in minutes, and the optional + path is the path of the cookie diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index c8cc3355ea3..18db1e2d904 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -404,11 +404,10 @@ the child processesThreadLimit Directive
    Description: Sets the upper limit on the configurable number of threads per child process
    Syntax: - ThreadLimit number
    Default: - ThreadLimit 64
    Context: + ThreadLimit number
    Context: server config
    Status: MPM
    Module: - worker
    + mpm_winnt, worker

    This directive sets the maximum configured value for ThreadsPerChild for the lifetime of the Apache process. Any attempts to change this directive during a restart will be ignored, but ThreadsPerChild can be modified @@ -420,15 +419,17 @@ per child processThreadLimit and ThreadsPerChild are set to values higher than the system can handle, Apache may not start or the - system may become unstable.

    + system may become unstable. Do not set the value of this directive + any higher than your greatest predicted setting of ThreadsPerChild for the + current run of Apache.

    + +

    The default value for ThreadLimit is + 64 when used with worker and 1920 when used + with mpm_winnt.

    -

    Use this directive only if you need to set ThreadsPerChild higher than 64. Do - not set the value of this directive any higher than what you might - want to set ThreadsPerChild to.

    ThreadsPerChild Directive

    Description: Number of threads created by each child process
    Syntax: - ThreadsPerChild number
    Default: - ThreadsPerChild 50
    Context: + ThreadsPerChild number
    Context: server config
    Status: MPM
    Module: worker, mpm_winnt
    @@ -440,6 +441,11 @@ per child processworker and 64 when used with + mpm_winnt.

    +

    User Directive

    Description: The userid under which the server will answer requests
    Syntax: diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 9cd6d3ee533..7aac9d69eaa 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -540,9 +540,8 @@ the child processes Sets the upper limit on the configurable number of threads per child process ThreadLimit number -ThreadLimit 64 server config -worker +mpm_winntworker

    This directive sets the maximum configured value for ThreadLimit and ThreadsPerChild are set to values higher than the system can handle, Apache may not start or the - system may become unstable.

    + system may become unstable. Do not set the value of this directive + any higher than your greatest predicted setting of ThreadsPerChild for the + current run of Apache.

    + +

    The default value for ThreadLimit is + 64 when used with worker and 1920 when used + with mpm_winnt.

    -

    Use this directive only if you need to set ThreadsPerChild higher than 64. Do - not set the value of this directive any higher than what you might - want to set ThreadsPerChild to.

     @@ -573,7 +574,6 @@ per child process ThreadsPerChild Number of threads created by each child process ThreadsPerChild number -ThreadsPerChild 50 server config workermpm_winnt @@ -587,6 +587,11 @@ per child process like worker, where there are multiple child processes, the total number of threads should be high enough to handle the common load on the server.

    + +

    The default value for this directive is 25 when used with + worker and 64 when used with + mpm_winnt.

    + diff --git a/docs/manual/mod/mpm_winnt.html.ja.jis b/docs/manual/mod/mpm_winnt.html.ja.jis index a7963924d9d..a571910f19b 100644 --- a/docs/manual/mod/mpm_winnt.html.ja.jis +++ b/docs/manual/mod/mpm_winnt.html.ja.jis @@ -4,10 +4,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->mpm_winnt - Apache HTTP Server
    [APACHE DOCUMENTATION]

    Apache HTTP Server Version 2.0

    Apache モジュール mpm_winnt

    説明: Windows NT -向けに最適化されたマルチプロセッシングモジュール
    ステータス: - MPM
    モジュール識別子: +向けに最適化されたマルチプロセッシングモジュール
    ステータス: + MPM
    モジュール識別子: mpm_winnt_module

    概要

    -

    このマルチプロセッシングモジュール (MPM) +

    このマルチプロセッシングモジュール (MPM) は Windows NT でのデフォルトになります。 一つの制御用プロセスを用い、これが一つの子プロセスを起動し、 そして子プロセスがリクエストを取り扱うためにスレッドを