From: Rich Bowen Date: Tue, 23 Mar 2010 00:54:41 +0000 (+0000) Subject: 'Apache' => 'Apache HTTP Server" etc. X-Git-Tag: 2.3.6~308 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4d07618575b9d6a9ef63f5d476fc3c62ccb4cd3;p=thirdparty%2Fapache%2Fhttpd.git 'Apache' => 'Apache HTTP Server" etc. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926419 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 610eb412c34..a8f21bf12dc 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -110,8 +110,8 @@ available Context:server config Status:Core Module:core -Compatibility:Available in Apache 2.1.5 and later. -On Windows from Apache 2.3.3 and later. +Compatibility:Available in Apache httpd 2.1.5 and later. +On Windows from Apache httpd 2.3.3 and later.

This directive enables operating system specific optimizations for a listening socket by the Protocol type. The basic premise is for the @@ -189,7 +189,7 @@ On Windows from Apache 2.3.3 and later. Override:FileInfo Status:Core Module:core -Compatibility:Available in Apache 2.0.30 and later +Compatibility:Available in Apache httpd 2.0.30 and later

This directive controls whether requests that contain trailing @@ -345,7 +345,7 @@ content-type is text/plain or text/html Override:FileInfo Status:Core Module:core -Compatibility:Available in Apache 2.0.33 and later; deprecated in Apache 2.1 and later +Compatibility:Available in Apache httpd 2.0.33 and later; deprecated in Apache httpd 2.1 and later

This directive activates a particular output filter for a request depending on the response media-type. Because of certain @@ -410,7 +410,7 @@ be passed through Context:server config, virtual host Status:Core Module:core -Compatibility:Available in Apache 2.0.46 and later +Compatibility:Available in Apache httpd 2.0.46 and later

The AllowEncodedSlashes directive allows URLs which contain encoded path separators (%2F for / @@ -558,7 +558,7 @@ scripts Module:core Compatibility:NetWare only -

This directive is used to control how Apache finds the +

This directive is used to control how Apache httpd finds the interpreter used to run CGI scripts. For example, setting CGIMapExtension sys:\foo.nlm .foo will cause all CGI script files with a .foo extension to @@ -619,7 +619,7 @@ which no other media type configuration could be found. Override:FileInfo Status:Core Module:core -Compatibility:The argument none is available in Apache 2.2.7 and later. All other choices are DISABLED for 2.3.x and later. +Compatibility:The argument none is available in Apache httpd 2.2.7 and later. All other choices are DISABLED for 2.3.x and later.

This directive has been disabled. For backwards compatibility of configuration files, it may be specified with the value @@ -690,7 +690,7 @@ named file-system directory and sub-directories

Be careful with the directory-path arguments: - They have to literally match the filesystem path which Apache uses + They have to literally match the filesystem path which Apache httpd uses to access the files. Directives applied to a particular <Directory> will not apply to files accessed from that same directory via a different path, such as via different symbolic @@ -763,9 +763,9 @@ named file-system directory and sub-directories the corresponding <Directory> will be applied.

-

Note that the default Apache access for +

Note that the default access for <Directory /> is Allow from All. - This means that Apache will serve any file mapped from an URL. It is + This means that Apache httpd will serve any file mapped from an URL. It is recommended that you change this with a block such as

@@ -879,7 +879,7 @@ Locations memory-mapping if it needs to read the contents of a file during delivery. By default, when the handling of a request requires access to the data within a file -- for example, when delivering a - server-parsed file using mod_include -- Apache + server-parsed file using mod_include -- Apache httpd memory-maps the file if the OS supports it.

This memory-mapping sometimes yields a performance improvement. @@ -930,7 +930,7 @@ Locations sendfile support from the kernel to transmit file contents to the client. By default, when the handling of a request requires no access to the data within a file -- for example, when delivering a - static file -- Apache uses sendfile to deliver the file contents + static file -- Apache httpd uses sendfile to deliver the file contents without ever reading the file if the OS supports it.

This sendfile mechanism avoids separate read and send operations, @@ -987,10 +987,10 @@ in case of an error Override:FileInfo Status:Core Module:core -Compatibility:Quoting syntax for text messages is different in Apache +Compatibility:Quoting syntax for text messages is different in Apache HTTP Server 2.0 -

In the event of a problem or error, Apache can be configured +

In the event of a problem or error, Apache httpd can be configured to do one of four things,

    @@ -1008,7 +1008,7 @@ in case of an error

    The first option is the default, while options 2-4 are configured using the ErrorDocument directive, which is followed by the HTTP response code and a URL - or a message. Apache will sometimes offer additional information + or a message. Apache httpd will sometimes offer additional information regarding the problem/error.

    URLs can begin with a slash (/) for local web-paths (relative @@ -1024,9 +1024,9 @@ in case of an error

Additionally, the special value default can be used - to specify Apache's simple hardcoded message. While not required + to specify Apache httpd's simple hardcoded message. While not required under normal circumstances, default will restore - Apache's simple hardcoded message for configurations that would + Apache httpd's simple hardcoded message for configurations that would otherwise inherit an existing ErrorDocument.

@@ -1040,7 +1040,7 @@ in case of an error

Note that when you specify an ErrorDocument that points to a remote URL (ie. anything with a method such as - http in front of it), Apache will send a redirect to the + http in front of it), Apache HTTP Server will send a redirect to the client to tell it where to find the document, even if the document ends up being on the same server. This has several implications, the most important being that the client will not @@ -1073,7 +1073,7 @@ in case of an error

If you are using mod_proxy, you may wish to enable ProxyErrorOverride so that you can provide custom error messages on behalf of your Origin servers. If you don't enable ProxyErrorOverride, - Apache will not generate custom error documents for proxied content.

+ Apache httpd will not generate custom error documents for proxied content.

See also

top
@@ -1187,7 +1187,7 @@ HTTP response header for static files attributes that are used to create the ETag (entity tag) response header field when the document is based on a static file. (The ETag value is used in cache management to save - network bandwidth.) In Apache 1.3.22 and earlier, the + network bandwidth.) In Apache httpd 1.3.22 and earlier, the ETag value was always formed from the file's inode, size, and last-modified time (mtime). The FileETag directive allows you to choose @@ -1329,7 +1329,7 @@ media type in the HTTP Content-Type header field Override:FileInfo Status:Core Module:core -Compatibility:Moved to the core in Apache 2.0 +Compatibility:Moved to the core in Apache httpd 2.0

When placed into an .htaccess file or a <Directory>, or @@ -1545,7 +1545,7 @@ later.

In the former case, the directives between the start and end markers are only processed if the module named module - is included in Apache -- either compiled in or + is included in Apache httpd -- either compiled in or dynamically loaded using LoadModule. The second format reverses the test, and only processes the directives if module is not included.

@@ -1587,7 +1587,7 @@ wildcard matching available in 2.3.6 and later in the filename or directory parts of the path to include several files at once, in alphabetical order. In addition, if Include points to a directory, rather than a file, - Apache will read all files in that directory and any subdirectory. + Apache httpd will read all files in that directory and any subdirectory. However, including entire directories is not recommended, because it is easy to accidentally leave temporary files in a directory that can cause httpd to fail. Instead, we encourage you to use the @@ -1685,9 +1685,9 @@ requests on a persistent connection Status:Core Module:core Compatibility:Specifying a value in milliseconds is available in -Apache 2.3.2 and later +Apache httpd 2.3.2 and later -

The number of seconds Apache will wait for a subsequent +

The number of seconds Apache httpd will wait for a subsequent request before closing the connection. By adding a postfix of ms the timeout can be also set in milliseconds. Once a request has been received, the timeout value specified by the @@ -1827,10 +1827,10 @@ subrequests Context:server config, virtual host Status:Core Module:core -Compatibility:Available in Apache 2.0.47 and later +Compatibility:Available in Apache httpd 2.0.47 and later

An internal redirect happens, for example, when using the Action directive, which internally - redirects the original request to a CGI script. A subrequest is Apache's + redirects the original request to a CGI script. A subrequest is Apache httpd's mechanism to find out what would happen for some URI if it were requested. For example, mod_dir uses subrequests to look for the files listed in the DirectoryIndex @@ -2322,7 +2322,7 @@ or specified mutexes Context:server config Status:Core Module:core -Compatibility:Available in Apache 2.3.4 and later +Compatibility:Available in Apache HTTP Server 2.3.4 and later

The Mutex directive sets the mechanism, and optionally the lock file location, that httpd and modules use @@ -2785,7 +2785,7 @@ directory

RLimitCPU Directive

+by Apache httpd children @@ -2802,10 +2802,10 @@ by Apache children the server is running as root, or in the initial startup phase.

-

This applies to processes forked off from Apache children - servicing requests, not the Apache children themselves. This +

This applies to processes forked off from Apache httpd children + servicing requests, not the Apache httpd children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked off from the Apache httpd parent such as piped logs.

CPU resource limits are expressed in seconds per @@ -2821,7 +2821,7 @@ by Apache children

RLimitMEM Directive

Description:Limits the CPU consumption of processes launched -by Apache children
Syntax:RLimitCPU seconds|max [seconds|max]
Default:Unset; uses operating system defaults
Context:server config, virtual host, directory, .htaccess
+by Apache httpd children @@ -2838,10 +2838,10 @@ by Apache children the server is running as root, or in the initial startup phase.

-

This applies to processes forked off from Apache children - servicing requests, not the Apache children themselves. This +

This applies to processes forked off from Apache httpd children + servicing requests, not the Apache httpd children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked off from the Apache httpd parent such as piped logs.

Memory resource limits are expressed in bytes per @@ -2857,7 +2857,7 @@ by Apache children

RLimitNPROC Directive

Description:Limits the memory consumption of processes launched -by Apache children
Syntax:RLimitMEM bytes|max [bytes|max]
Default:Unset; uses operating system defaults
Context:server config, virtual host, directory, .htaccess
+processes launched by Apache httpd children @@ -2874,10 +2874,10 @@ processes launched by Apache children the server is running as root, or in the initial startup phase.

-

This applies to processes forked off from Apache children - servicing requests, not the Apache children themselves. This +

This applies to processes forked off from Apache httpd children + servicing requests, not the Apache httpd children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked off from the Apache httpd parent such as piped logs.

Process limits control the number of processes per user.

@@ -2909,12 +2909,12 @@ scripts
Description:Limits the number of processes that can be launched by -processes launched by Apache children
Syntax:RLimitNPROC number|max [number|max]
Default:Unset; uses operating system defaults
Context:server config, virtual host, directory, .htaccess
Status:Core
Module:core
Compatibility:Win32 only; -option Registry-Strict is available in Apache 2.0 and +option Registry-Strict is available in Apache HTTP Server 2.0 and later
-

This directive is used to control how Apache finds the +

This directive is used to control how Apache httpd finds the interpreter used to run CGI scripts. The default setting is - Script. This causes Apache to use the interpreter pointed to + Script. This causes Apache httpd to use the interpreter pointed to by the shebang line (first line, starting with #!) in the script. On Win32 systems this line usually looks like:

@@ -2934,13 +2934,13 @@ later search key. The command defined by the registry subkey Shell\ExecCGI\Command or, if it does not exist, by the subkey Shell\Open\Command is used to open the script file. If the - registry keys cannot be found, Apache falls back to the behavior of the + registry keys cannot be found, Apache httpd falls back to the behavior of the Script option.

Security

Be careful when using ScriptInterpreterSource Registry with ScriptAlias'ed directories, because - Apache will try to execute every file within this + Apache httpd will try to execute every file within this directory. The Registry setting may cause undesired program calls on files which are typically not executed. For example, the default open command on .htm files on @@ -2951,7 +2951,7 @@ later so.

-

The option Registry-Strict which is new in Apache +

The option Registry-Strict which is new in Apache HTTP Server 2.0 does the same thing as Registry but uses only the subkey Shell\ExecCGI\Command. The ExecCGI key is not a common one. It must be @@ -2970,7 +2970,7 @@ of a request or the last 63, assuming the request itself is greater than Context:server config Status:Core Module:core -Compatibility:Available in Apache 2.2.7 and later. +Compatibility:Available in Apache httpd 2.2.7 and later.

mod_status with ExtendedStatus On displays the actual request being handled. @@ -2981,7 +2981,7 @@ of a request or the last 63, assuming the request itself is greater than is only applicable, of course, if the length of the request is 64 characters or greater.

-

If Apache is handling GET /disk1/storage/apache/htdocs/images/imagestore1/food/apples.jpg HTTP/1.1 mod_status displays as follows: +

If Apache httpd is handling GET /disk1/storage/apache/htdocs/images/imagestore1/food/apples.jpg HTTP/1.1 mod_status displays as follows:

@@ -3052,7 +3052,7 @@ to name-virtual hosts

See also

top
@@ -3117,8 +3117,8 @@ itself

See also

- +
Override:FileInfo
Status:Core
Module:core
Compatibility:Moved into the core in Apache 2.0
Compatibility:Moved into the core in Apache httpd 2.0

When placed into an .htaccess file or a <Directory> or @@ -3406,7 +3406,7 @@ certain events before failing a request Module:core

The TimeOut directive defines the length - of time Apache will wait for I/O in various circumstances:

+ of time Apache httpd will wait for I/O in various circumstances:

  1. When reading data from the client, the length of time to @@ -3440,7 +3440,7 @@ requests Context:server config Status:Core Module:core -Compatibility:Available in Apache 1.3.34, 2.0.55 and later +Compatibility:Available in Apache HTTP Server 1.3.34, 2.0.55 and later

    This directive overrides the behavior of TRACE for both the core server and mod_proxy. The default @@ -3485,15 +3485,15 @@ port Status:Core Module:core -

    In many situations Apache must construct a self-referential +

    In many situations Apache httpd must construct a self-referential URL -- that is, a URL that refers back to the same server. With - UseCanonicalName On Apache will use the hostname and port + UseCanonicalName On Apache httpd will use the hostname and port specified in the ServerName directive to construct the canonical name for the server. This name is used in all self-referential URLs, and for the values of SERVER_NAME and SERVER_PORT in CGIs.

    -

    With UseCanonicalName Off Apache will form +

    With UseCanonicalName Off Apache httpd will form self-referential URLs using the hostname and port supplied by the client if any are supplied (otherwise it will use the canonical name, as defined above). These values are the same @@ -3507,19 +3507,19 @@ port names such as www. You'll notice that if the users type a shortname, and a URL which is a directory, such as http://www/splat, without the trailing - slash then Apache will redirect them to + slash then Apache httpd will redirect them to http://www.domain.com/splat/. If you have authentication enabled, this will cause the user to have to authenticate twice (once for www and once again for www.domain.com -- see the FAQ on this subject for more information). But if UseCanonicalName is set Off, then - Apache will redirect to http://www/splat/.

    + Apache httpd will redirect to http://www/splat/.

    There is a third option, UseCanonicalName DNS, which is intended for use with mass IP-based virtual hosting to support ancient clients that do not provide a - Host: header. With this option Apache does a + Host: header. With this option Apache httpd does a reverse DNS lookup on the server IP address that the client connected to in order to work out self-referential URLs.

    @@ -3549,14 +3549,14 @@ port Status:Core Module:core -

    In many situations Apache must construct a self-referential +

    In many situations Apache httpd must construct a self-referential URL -- that is, a URL that refers back to the same server. With - UseCanonicalPhysicalPort On Apache will, when + UseCanonicalPhysicalPort On Apache httpd will, when constructing the canonical port for the server to honor the UseCanonicalName directive, provide the actual physical port number being used by this request as a potential port. With UseCanonicalPhysicalPort Off - Apache will not ever use the actual physical port number, instead + Apache httpd will not ever use the actual physical port number, instead relying on all configured information to construct a valid port number.

    Note

    @@ -3660,8 +3660,8 @@ hostname or IP address

    Note

    The use of <VirtualHost> does - not affect what addresses Apache listens on. You - may need to ensure that Apache is listening on the correct addresses + not affect what addresses Apache httpd listens on. You + may need to ensure that Apache httpd is listening on the correct addresses using Listen.

    @@ -3694,11 +3694,11 @@ hostname or IP address

    See also

      -
    • Apache Virtual Host documentation
      • +
    • Apache HTTP Server Virtual Host documentation
    • Issues Regarding DNS and - Apache
      • + Apache HTTP Server
    • Setting - which addresses and ports Apache uses
      • + which addresses and ports Apache HTTP Server uses
    • How <Directory>, <Location> and <Files> sections work for an explanation of how these different sections are combined when a request is received
      • diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 80575723c39..3f9e1d33018 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -32,8 +32,8 @@ available Configures optimizations for a Protocol's Listener Sockets AcceptFilter protocol accept_filter server config -Available in Apache 2.1.5 and later. -On Windows from Apache 2.3.3 and later. +Available in Apache httpd 2.1.5 and later. +On Windows from Apache httpd 2.3.3 and later.

      This directive enables operating system specific optimizations for a @@ -112,7 +112,7 @@ On Windows from Apache 2.3.3 and later. virtual hostdirectory .htaccess FileInfo -Available in Apache 2.0.30 and later +Available in Apache httpd 2.0.30 and later @@ -267,7 +267,7 @@ content-type is text/plain or text/html virtual hostdirectory .htaccess FileInfo -Available in Apache 2.0.33 and later; deprecated in Apache 2.1 and later +Available in Apache httpd 2.0.33 and later; deprecated in Apache httpd 2.1 and later

      This directive activates a particular output AllowEncodedSlashes Off server configvirtual host -Available in Apache 2.0.46 and later +Available in Apache httpd 2.0.46 and later

      The AllowEncodedSlashes directive allows URLs @@ -507,7 +507,7 @@ scripts NetWare only -

      This directive is used to control how Apache finds the +

      This directive is used to control how Apache httpd finds the interpreter used to run CGI scripts. For example, setting CGIMapExtension sys:\foo.nlm .foo will cause all CGI script files with a .foo extension to @@ -570,7 +570,7 @@ which no other media type configuration could be found. directory.htaccess FileInfo -The argument none is available in Apache 2.2.7 and later. All other choices are DISABLED for 2.3.x and later. +The argument none is available in Apache httpd 2.2.7 and later. All other choices are DISABLED for 2.3.x and later.

      This directive has been disabled. For backwards compatibility @@ -643,7 +643,7 @@ named file-system directory and sub-directories

      Be careful with the directory-path arguments: - They have to literally match the filesystem path which Apache uses + They have to literally match the filesystem path which Apache httpd uses to access the files. Directives applied to a particular <Directory> will not apply to files accessed from that same directory via a different path, such as via different symbolic @@ -718,9 +718,9 @@ named file-system directory and sub-directories the corresponding Directory will be applied.

      -

      Note that the default Apache access for +

      Note that the default access for <Directory /> is Allow from All. - This means that Apache will serve any file mapped from an URL. It is + This means that Apache httpd will serve any file mapped from an URL. It is recommended that you change this with a block such as

      @@ -833,7 +833,7 @@ Locations       memory-mapping if it needs to read the contents of a file during delivery. By default, when the handling of a request requires access to the data within a file -- for example, when delivering a - server-parsed file using mod_include -- Apache + server-parsed file using mod_include -- Apache httpd memory-maps the file if the OS supports it.

      This memory-mapping sometimes yields a performance improvement. @@ -885,7 +885,7 @@ Locations sendfile support from the kernel to transmit file contents to the client. By default, when the handling of a request requires no access to the data within a file -- for example, when delivering a - static file -- Apache uses sendfile to deliver the file contents + static file -- Apache httpd uses sendfile to deliver the file contents without ever reading the file if the OS supports it.

      This sendfile mechanism avoids separate read and send operations, @@ -943,11 +943,11 @@ in case of an error directory.htaccess FileInfo -Quoting syntax for text messages is different in Apache +Quoting syntax for text messages is different in Apache HTTP Server 2.0 -

      In the event of a problem or error, Apache can be configured +

      In the event of a problem or error, Apache httpd can be configured to do one of four things,

        @@ -965,7 +965,7 @@ in case of an error

        The first option is the default, while options 2-4 are configured using the ErrorDocument directive, which is followed by the HTTP response code and a URL - or a message. Apache will sometimes offer additional information + or a message. Apache httpd will sometimes offer additional information regarding the problem/error.

        URLs can begin with a slash (/) for local web-paths (relative @@ -981,9 +981,9 @@ in case of an error

        Additionally, the special value default can be used - to specify Apache's simple hardcoded message. While not required + to specify Apache httpd's simple hardcoded message. While not required under normal circumstances, default will restore - Apache's simple hardcoded message for configurations that would + Apache httpd's simple hardcoded message for configurations that would otherwise inherit an existing ErrorDocument.

        @@ -997,7 +997,7 @@ in case of an error

        Note that when you specify an ErrorDocument that points to a remote URL (ie. anything with a method such as - http in front of it), Apache will send a redirect to the + http in front of it), Apache HTTP Server will send a redirect to the client to tell it where to find the document, even if the document ends up being on the same server. This has several implications, the most important being that the client will not @@ -1032,7 +1032,7 @@ in case of an error

        If you are using mod_proxy, you may wish to enable ProxyErrorOverride so that you can provide custom error messages on behalf of your Origin servers. If you don't enable ProxyErrorOverride, - Apache will not generate custom error documents for proxied content.

        + Apache httpd will not generate custom error documents for proxied content.

        documentation of @@ -1089,7 +1089,7 @@ in case of an error LogLevel -Apache Log Files +Apache HTTP Server Log Files @@ -1143,7 +1143,7 @@ HTTP response header for static files attributes that are used to create the ETag (entity tag) response header field when the document is based on a static file. (The ETag value is used in cache management to save - network bandwidth.) In Apache 1.3.22 and earlier, the + network bandwidth.) In Apache httpd 1.3.22 and earlier, the ETag value was always formed from the file's inode, size, and last-modified time (mtime). The FileETag directive allows you to choose @@ -1288,7 +1288,7 @@ media type in the HTTP Content-Type header field directory.htaccess FileInfo -Moved to the core in Apache 2.0 +Moved to the core in Apache httpd 2.0

        When placed into an .htaccess file or a @@ -1510,7 +1510,7 @@ later.

        In the former case, the directives between the start and end markers are only processed if the module named module - is included in Apache -- either compiled in or + is included in Apache httpd -- either compiled in or dynamically loaded using LoadModule. The second format reverses the test, and only processes the directives if module is @@ -1554,7 +1554,7 @@ wildcard matching available in 2.3.6 and later in the filename or directory parts of the path to include several files at once, in alphabetical order. In addition, if Include points to a directory, rather than a file, - Apache will read all files in that directory and any subdirectory. + Apache httpd will read all files in that directory and any subdirectory. However, including entire directories is not recommended, because it is easy to accidentally leave temporary files in a directory that can cause httpd to fail. Instead, we encourage you to use the @@ -1649,10 +1649,10 @@ requests on a persistent connection server configvirtual host Specifying a value in milliseconds is available in -Apache 2.3.2 and later +Apache httpd 2.3.2 and later -

        The number of seconds Apache will wait for a subsequent +

        The number of seconds Apache httpd will wait for a subsequent request before closing the connection. By adding a postfix of ms the timeout can be also set in milliseconds. Once a request has been received, the timeout value specified by the @@ -1799,12 +1799,12 @@ subrequests LimitInternalRecursion 10 server configvirtual host -Available in Apache 2.0.47 and later +Available in Apache httpd 2.0.47 and later

        An internal redirect happens, for example, when using the Action directive, which internally - redirects the original request to a CGI script. A subrequest is Apache's + redirects the original request to a CGI script. A subrequest is Apache httpd's mechanism to find out what would happen for some URI if it were requested. For example, mod_dir uses subrequests to look for the files listed in the DirectoryIndex @@ -2300,7 +2300,7 @@ or specified mutexes Mutex mechanism [default|mutex-name] ... [OmitPID] Mutex default server config -Available in Apache 2.3.4 and later +Available in Apache HTTP Server 2.3.4 and later

        The Mutex directive sets the mechanism, @@ -2769,7 +2769,7 @@ directory RLimitCPU Limits the CPU consumption of processes launched -by Apache children +by Apache httpd children RLimitCPU seconds|max [seconds|max] Unset; uses operating system defaults server configvirtual host @@ -2786,10 +2786,10 @@ by Apache children the server is running as root, or in the initial startup phase.

        -

        This applies to processes forked off from Apache children - servicing requests, not the Apache children themselves. This +

        This applies to processes forked off from Apache httpd children + servicing requests, not the Apache httpd children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked off from the Apache httpd parent such as piped logs.

        CPU resource limits are expressed in seconds per @@ -2802,7 +2802,7 @@ by Apache children RLimitMEM Limits the memory consumption of processes launched -by Apache children +by Apache httpd children RLimitMEM bytes|max [bytes|max] Unset; uses operating system defaults server configvirtual host @@ -2819,10 +2819,10 @@ by Apache children the server is running as root, or in the initial startup phase.

        -

        This applies to processes forked off from Apache children - servicing requests, not the Apache children themselves. This +

        This applies to processes forked off from Apache httpd children + servicing requests, not the Apache httpd children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked off from the Apache httpd parent such as piped logs.

        Memory resource limits are expressed in bytes per @@ -2835,7 +2835,7 @@ by Apache children RLimitNPROC Limits the number of processes that can be launched by -processes launched by Apache children +processes launched by Apache httpd children RLimitNPROC number|max [number|max] Unset; uses operating system defaults server configvirtual host @@ -2852,10 +2852,10 @@ processes launched by Apache children the server is running as root, or in the initial startup phase.

        -

        This applies to processes forked off from Apache children - servicing requests, not the Apache children themselves. This +

        This applies to processes forked off from Apache httpd children + servicing requests, not the Apache httpd children themselves. This includes CGI scripts and SSI exec commands, but not any - processes forked off from the Apache parent such as piped + processes forked off from the Apache httpd parent such as piped logs.

        Process limits control the number of processes per user.

        @@ -2883,13 +2883,13 @@ scripts directory.htaccess FileInfo Win32 only; -option Registry-Strict is available in Apache 2.0 and +option Registry-Strict is available in Apache HTTP Server 2.0 and later -

        This directive is used to control how Apache finds the +

        This directive is used to control how Apache httpd finds the interpreter used to run CGI scripts. The default setting is - Script. This causes Apache to use the interpreter pointed to + Script. This causes Apache httpd to use the interpreter pointed to by the shebang line (first line, starting with #!) in the script. On Win32 systems this line usually looks like:

        @@ -2909,14 +2909,14 @@ later search key. The command defined by the registry subkey Shell\ExecCGI\Command or, if it does not exist, by the subkey Shell\Open\Command is used to open the script file. If the - registry keys cannot be found, Apache falls back to the behavior of the + registry keys cannot be found, Apache httpd falls back to the behavior of the Script option.

        Security

        Be careful when using ScriptInterpreterSource Registry with ScriptAlias'ed directories, because - Apache will try to execute every file within this + Apache httpd will try to execute every file within this directory. The Registry setting may cause undesired program calls on files which are typically not executed. For example, the default open command on .htm files on @@ -2927,7 +2927,7 @@ later so.

         -

        The option Registry-Strict which is new in Apache +

        The option Registry-Strict which is new in Apache HTTP Server 2.0 does the same thing as Registry but uses only the subkey Shell\ExecCGI\Command. The ExecCGI key is not a common one. It must be @@ -2944,7 +2944,7 @@ of a request or the last 63, assuming the request itself is greater than SeeRequestTail On|Off SeeRequestTail Off server config -Available in Apache 2.2.7 and later. +Available in Apache httpd 2.2.7 and later.

        mod_status with ExtendedStatus On @@ -2956,7 +2956,7 @@ of a request or the last 63, assuming the request itself is greater than is only applicable, of course, if the length of the request is 64 characters or greater.

        -

        If Apache is handling If Apache httpd is handling GET /disk1/storage/apache/htdocs/images/imagestore1/food/apples.jpg HTTP/1.1 mod_status displays as follows:

        @@ -3027,7 +3027,7 @@ to name-virtual hosts </VirtualHost>         -Apache Virtual Host documentation +Apache HTTP Server Virtual Host documentation @@ -3091,8 +3091,8 @@ itself Issues Regarding DNS and - Apache -Apache virtual host + Apache HTTP Server +Apache HTTP Server virtual host documentation UseCanonicalName UseCanonicalPhysicalPort @@ -3112,7 +3112,7 @@ is accessed by an incompatible browser URL pathname for a host, for use with name-based virtual hosts.

        -Apache Virtual Host documentation +Apache HTTP Server Virtual Host documentation         @@ -3254,7 +3254,7 @@ handler directory.htaccess FileInfo -Moved into the core in Apache 2.0 +Moved into the core in Apache httpd 2.0

        When placed into an .htaccess file or a @@ -3367,7 +3367,7 @@ certain events before failing a request

        The TimeOut directive defines the length - of time Apache will wait for I/O in various circumstances:

        + of time Apache httpd will wait for I/O in various circumstances:

        1. When reading data from the client, the length of time to @@ -3399,7 +3399,7 @@ requests TraceEnable [on|off|extended] TraceEnable on server config -Available in Apache 1.3.34, 2.0.55 and later +Available in Apache HTTP Server 1.3.34, 2.0.55 and later

          This directive overrides the behavior of TRACE for both @@ -3445,15 +3445,15 @@ port directory -

          In many situations Apache must construct a self-referential +

          In many situations Apache httpd must construct a self-referential URL -- that is, a URL that refers back to the same server. With - UseCanonicalName On Apache will use the hostname and port + UseCanonicalName On Apache httpd will use the hostname and port specified in the ServerName directive to construct the canonical name for the server. This name is used in all self-referential URLs, and for the values of SERVER_NAME and SERVER_PORT in CGIs.

          -

          With UseCanonicalName Off Apache will form +

          With UseCanonicalName Off Apache httpd will form self-referential URLs using the hostname and port supplied by the client if any are supplied (otherwise it will use the canonical name, as defined above). These values are the same @@ -3468,7 +3468,7 @@ port names such as www. You'll notice that if the users type a shortname, and a URL which is a directory, such as http://www/splat, without the trailing - slash then Apache will redirect them to + slash then Apache httpd will redirect them to http://www.domain.com/splat/. If you have authentication enabled, this will cause the user to have to authenticate twice (once for www and once again @@ -3476,12 +3476,12 @@ port href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">the FAQ on this subject for more information). But if UseCanonicalName is set Off, then - Apache will redirect to http://www/splat/.

          + Apache httpd will redirect to http://www/splat/.

          There is a third option, UseCanonicalName DNS, which is intended for use with mass IP-based virtual hosting to support ancient clients that do not provide a - Host: header. With this option Apache does a + Host: header. With this option Apache httpd does a reverse DNS lookup on the server IP address that the client connected to in order to work out self-referential URLs.

          @@ -3508,14 +3508,14 @@ port directory -

          In many situations Apache must construct a self-referential +

          In many situations Apache httpd must construct a self-referential URL -- that is, a URL that refers back to the same server. With - UseCanonicalPhysicalPort On Apache will, when + UseCanonicalPhysicalPort On Apache httpd will, when constructing the canonical port for the server to honor the UseCanonicalName directive, provide the actual physical port number being used by this request as a potential port. With UseCanonicalPhysicalPort Off - Apache will not ever use the actual physical port number, instead + Apache httpd will not ever use the actual physical port number, instead relying on all configured information to construct a valid port number.

          Note @@ -3615,8 +3615,8 @@ hostname or IP address Note

          The use of VirtualHost does - not affect what addresses Apache listens on. You - may need to ensure that Apache is listening on the correct addresses + not affect what addresses Apache httpd listens on. You + may need to ensure that Apache httpd is listening on the correct addresses using Listen.

           @@ -3648,11 +3648,11 @@ hostname or IP address than the user that starts the server.

                     -Apache Virtual Host documentation +Apache HTTP Server Virtual Host documentation Issues Regarding DNS and - Apache + Apache HTTP Server Setting - which addresses and ports Apache uses + which addresses and ports Apache HTTP Server uses How <Directory>, <Location> and <Files> sections work for an explanation of how these different sections are combined when a request is received diff --git a/docs/manual/mod/mod_setenvif.xml.ja b/docs/manual/mod/mod_setenvif.xml.ja index 359cf2db841..2d4222e0e0a 100644 --- a/docs/manual/mod/mod_setenvif.xml.ja +++ b/docs/manual/mod/mod_setenvif.xml.ja @@ -1,7 +1,7 @@ - + + +