takashi at apache
May 9, 2008, 8:08 PM
Post #1 of 1
(15 views)
Permalink
|
|
svn commit: r655009 - in /httpd/httpd/branches/2.2.x/docs/manual: mod/core.xml mod/core.xml.de mod/core.xml.ja urlmapping.xml
|
|
Author: takashi
Date: Fri May 9 20:08:13 2008
New Revision: 655009
URL: http://svn.apache.org/viewvc?rev=655009&view=rev
Log:
Merge r349476 from trunk:
- try to add a note to explain the behaviour of clients use a pipelined
connection wrt to MaxRequestsPerChild and KeepAlive.
Merge r413683 from trunk:
A little bit more detail, and an example, for how DocumentRoot is
handled. Examples good.
Merge r449032 from trunk:
Capitalization consistency
Submitted by Vincent Bray
Merge r649076 from trunk:
Replace reference to obsolete RFC. Submitted by: Igor Galić.
Modified:
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja
httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=655009&r1=655008&r2=655009&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Fri May 9 20:08:13 2008
@@ -565,7 +565,7 @@
<usage>
<p>This directive enables the generation of
<code>Content-MD5</code> headers as defined in RFC1864
- respectively RFC2068.</p>
+ respectively RFC2616.</p>
<p>MD5 is an algorithm for computing a "message digest"
(sometimes called "fingerprint") of arbitrary-length data, with
@@ -842,8 +842,8 @@
<p>The <directive>DocumentRoot</directive> should be specified without
a trailing slash.</p>
</usage>
-<seealso><a href="../urlmapping.html">Mapping URLs to Filesystem
-Location</a></seealso>
+<seealso><a href="../urlmapping.html#documentroot">Mapping URLs to Filesystem
+Locations</a></seealso>
</directivesynopsis>
<directivesynopsis>
@@ -1549,6 +1549,10 @@
unless otherwise specified. If the client requests it, chunked
encoding will be used in order to send content of unknown
length over persistent connections.</p>
+
+ <p>When a client uses a Keep-Alive connection it will be counted
+ as a single "request" for the MaxRequestsPerChild directive, regardless
+ of how many requests are sent using the connection.</p>
</usage>
<seealso><directive module="core">MaxKeepAliveRequests</directive></seealso>
@@ -1792,8 +1796,8 @@
<name>LimitRequestFieldSize</name>
<description>Limits the size of the HTTP request header allowed from the
client</description>
-<syntax>LimitRequestFieldsize <var>bytes</var></syntax>
-<default>LimitRequestFieldsize 8190</default>
+<syntax>LimitRequestFieldSize <var>bytes</var></syntax>
+<default>LimitRequestFieldSize 8190</default>
<contextlist><context>server config</context></contextlist>
<usage>
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de?rev=655009&r1=655008&r2=655009&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.de Fri May 9 20:08:13 2008
@@ -518,7 +518,7 @@
<usage>
<p>Die Direktive aktiviert die Generierung von
- <code>Content-MD5</code>-Headern, wie sie in RFC1864 bzw. RFC2068
+ <code>Content-MD5</code>-Headern, wie sie in RFC1864 bzw. RFC2616
definiert sind.</p>
<p>MD5 ist ein Algorithmus zur Berechnung eines "Datenextrakts"
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja?rev=655009&r1=655008&r2=655009&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml.ja [iso-2022-jp] Fri May 9 20:08:13 2008
@@ -546,7 +546,7 @@
<status>Experimental</status>
<usage>
- <p>このディレクティブは、RFC1864 及び RFC2068 において定義されている
+ <p>このディレクティブは、RFC1864 及び RFC2616 において定義されている
<code>Content-MD5</code> ヘッダーの生成を有効にします。</p>
<p>MD5 は、任意長のデータの「メッセージダイジェスト」(「指紋」
@@ -1789,8 +1789,8 @@
<name>LimitRequestFieldSize</name>
<description>クライアントからの HTTP リクエストのヘッダの
サイズを制限する</description>
-<syntax>LimitRequestFieldsize <var>bytes</var></syntax>
-<default>LimitRequestFieldsize 8190</default>
+<syntax>LimitRequestFieldSize <var>bytes</var></syntax>
+<default>LimitRequestFieldSize 8190</default>
<contextlist><context>server config</context></contextlist>
<usage>
Modified: httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml?rev=655009&r1=655008&r2=655009&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml Fri May 9 20:08:13 2008
@@ -74,6 +74,12 @@
make up the basic document tree which will be visible from the
web.</p>
+ <p>For example, if <directive module="core">DocumentRoot</directive>
+ were set to <code>/var/www/html</code> then a request for
+ <code>http://www.example.com/fish/guppies.html</code> would result
+ in the file <code>/var/www/html/fish/guppies.html</code> being
+ served to the requesting client.</p>
+
<p>Apache is also capable of <a href="vhosts/">Virtual
Hosting</a>, where the server receives requests for more than one
host. In this case, a different <directive
@@ -83,6 +89,11 @@
be used to dynamically determine the appropriate place from which
to serve content based on the requested IP address or
hostname.</p>
+
+ <p>The <directive module="core">DocumentRoot</directive> directive
+ is set in your main server configuration file
+ (<code>httpd.conf</code>) and, possibly, once per additional <a
+ href="vhosts/">Virtual Host</a> you create.</p>
</section>
<section id="outside"><title>Files Outside the DocumentRoot</title>
|
