Skip to content

Commit 3024cfb

Browse files
committed
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1928079 13f79535-47bb-0310-9956-ffa450edef68
1 parent 471036b commit 3024cfb

18 files changed

+304
-99
lines changed

docs/man/httpd.8

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
.el .ne 3
2020
.IP "\\$1" \\$2
2121
..
22-
.TH "HTTPD" 8 "2018-09-27" "Apache HTTP Server" "httpd"
22+
.TH "HTTPD" 8 "2025-08-29" "Apache HTTP Server" "httpd"
2323

2424
.SH NAME
2525
httpd \- Apache Hypertext Transfer Protocol Server
@@ -92,7 +92,7 @@ Show the settings as parsed from the config file (currently only shows the virtu
9292
Skip document root check at startup/restart\&.
9393
.TP
9494
\fB-t\fR
95-
Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&. If -D \fIDUMP\fR_\fICERTS \fR is set and mod_ssl is used, configured SSL certificates will be printed\&. If -D \fIDUMP\fR_\fICA\fR_\fI_CERTS \fR is set and mod_ssl is used, configured SSL CA certificates and configured directories containing SSL CA certificates will be printed\&.
95+
Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. This option can be combined with various \fI-D DUMP_\&.\&.\&.\fR arguments to print information about the configuration, as listed below\&.
9696
.TP
9797
\fB-v\fR
9898
Print the version of \fBhttpd\fR, and then exit\&.
@@ -117,3 +117,22 @@ The \fIname\fR of the Apache httpd service to signal\&.
117117
\fB-w\fR
118118
Keep the console window open on error so that the error message can be read\&.
119119

120+
.SH "DUMPING CONFIGURATION DATA"
121+
122+
.PP
123+
The following options can be combined with \fI-t\fR to show information about the configuration:
124+
125+
126+
.TP
127+
\fI-D DUMP_VHOSTS\fR
128+
print details of the virtual host configuration\&.
129+
.TP
130+
\fI-D DUMP_MODULES\fR
131+
print (human-readable) details of all loaded modules\&.
132+
.TP
133+
\fI-D DUMP_MODULES\fR \fI-D DUMP_MODULE_DATA\fR
134+
print details of all loaded modules in a structured (TOML) format\&.
135+
.TP
136+
\fI-D DUMP_CERTS\fR
137+
If mod_ssl is loaded, print details of configured SSL/TLS certificates\&.
138+

docs/manual/configuring.html.en.utf8

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,24 @@ Server.</p>
6868
<p>httpd configuration files contain one directive per line.
6969
The backslash "\" may be used as the last character on a line
7070
to indicate that the directive continues onto the next line.
71-
There must be no other characters or white space between the
72-
backslash and the end of the line.</p>
71+
To be interpreted as such a continuation, there must be no
72+
other characters or white space between the backslash and the
73+
end of the line. </p>
7374

74-
<p>Arguments to directives are separated by whitespace. If an
75+
<p>Lines that begin with the hash character "#" are considered
76+
comments, and are ignored. Comments may <strong>not</strong> be
77+
included on the same line as a configuration directive, including
78+
at the start of a line that has been continued as described in the
79+
preceding pargraph.
80+
</p>
81+
82+
<p> White space occurring before a directive is ignored, so
83+
you may indent directives for clarity. Blank lines are also ignored.
84+
Arguments to directives are separated by whitespace. If an
7585
argument contains spaces, you must enclose that argument in quotes.</p>
7686

7787
<p>Directives in the configuration files are case-insensitive,
78-
but arguments to directives are often case sensitive. Lines
79-
that begin with the hash character "#" are considered
80-
comments, and are ignored. Comments may <strong>not</strong> be
81-
included on the same line as a configuration directive.
82-
White space occurring before a directive is ignored, so
83-
you may indent directives for clarity. Blank lines are also ignored.</p>
88+
but arguments to directives are often case sensitive. </p>
8489

8590
<p>The values of variables defined with the <code class="directive"><a href="./mod/core.html#define">Define</a></code> or of shell environment variables can
8691
be used in configuration file lines using the syntax
@@ -234,7 +239,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/configuring.html';
234239
}
235240
})(window, document);
236241
//--><!]]></script></div><div id="footer">
237-
<p class="apache">Copyright 2023 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
242+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
238243
<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/quickreference.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
239244
if (typeof(prettyPrint) !== 'undefined') {
240245
prettyPrint();

docs/manual/expr.html.en.utf8

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,8 @@ DIGIT ::= &lt;any US-ASCII digit "0".."9"&gt;</pre>
555555
<td>replace(string, "from", "to") replaces all occurrences of "from"
556556
in the string with "to". The first parameter must not be a literal string.
557557
</td><td /></tr>
558+
<tr><td><code>escapehtml</code></td>
559+
<td>Escape a HTML string</td><td /></tr>
558560
</table>
559561

560562
<p>The functions marked as "restricted" in the final column are not
@@ -740,7 +742,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/expr.html';
740742
}
741743
})(window, document);
742744
//--><!]]></script></div><div id="footer">
743-
<p class="apache">Copyright 2023 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
745+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
744746
<p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/quickreference.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
745747
if (typeof(prettyPrint) !== 'undefined') {
746748
prettyPrint();

docs/manual/mod/core.html.en.utf8

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,8 @@ NoDecode option available in 2.3.12 and later.</td></tr>
551551
to remain <em>set</em> while allowing any others to be set.
552552
</p></div>
553553

554-
<div class="example"><p><code>
555-
AllowOverride Options=Indexes,MultiViews
556-
</code></p></div>
554+
<pre class="prettyprint lang-config">AllowOverride Options=Indexes,MultiViews</pre>
555+
557556
</dd>
558557
</dl>
559558

@@ -1288,7 +1287,10 @@ version 2.3.9.</td></tr>
12881287
By default, when the handling of a request requires no access
12891288
to the data within a file -- for example, when delivering a
12901289
static file -- Apache httpd uses sendfile to deliver the file contents
1291-
without ever reading the file if the OS supports it.</p>
1290+
without ever reading the file if the OS supports it. If SSL/TLS is used
1291+
for the connection, or if any <a href="../filter.html">output filter</a>
1292+
is configured which inspects or modifies the output, the sendfile mechanism
1293+
will not be used regardless of this configuration option.</p>
12921294

12931295
<p>This sendfile mechanism avoids separate read and send operations,
12941296
and buffer allocations. But on some platforms or within some
@@ -3051,7 +3053,7 @@ from the client</td></tr>
30513053
<p>Example:</p>
30523054

30533055
<pre class="prettyprint lang-config"># Limit of 1 MiB
3054-
LimitXMLRequestBody 1073741824</pre>
3056+
LimitXMLRequestBody 1048576</pre>
30553057

30563058

30573059

@@ -5120,13 +5122,16 @@ certain events before failing a request</td></tr>
51205122
has been specified by this directive. The intent is to limit access to
51215123
paths derived from untrusted inputs.</p>
51225124

5123-
<div class="example"><p><code>
5124-
UNCList example.com other.example.com
5125-
</code></p></div>
5125+
<pre class="prettyprint lang-config">UNCList example.com other.example.com</pre>
5126+
51265127

51275128
<div class="warning"><h3>Security</h3>
5128-
<p>UNC paths accessed outside of request processing, such as during startup,
5129-
are not necessarily checked against the hosts configured with this directive.</p>
5129+
<p>The values specified by this directive are only checked by some
5130+
components of the server, prior to accessing filesystem paths that
5131+
may be inadvertently derived from untrusted inputs. </p>
5132+
<p> Windows systems should be isolated at the network layer from
5133+
making outbound SMB/NTLM calls to unexpected destinations as a
5134+
more comprehensive and pre-emptive measure.</p>
51305135
</div>
51315136

51325137
<div class="warning"><h3>Directive Ordering</h3>
@@ -5259,15 +5264,15 @@ port</td></tr>
52595264
<li>Parsed port from <code>Host:</code> header</li>
52605265
<li>Physical port (only with <code class="directive">UseCanonicalPhysicalPort</code> ON)</li>
52615266
<li>Port provided in <code class="directive"><a href="#servername">Servername</a></code></li>
5262-
<li>Default port</li>
5267+
<li>Default port for the scheme/protocol (such as 80 or 443)</li>
52635268
</ol>
52645269
</dd>
52655270
<dt><code>UseCanonicalName On</code></dt>
52665271
<dd>
52675272
<ol>
52685273
<li>Port provided in <code class="directive"><a href="#servername">Servername</a></code></li>
52695274
<li>Physical port (only with <code class="directive">UseCanonicalPhysicalPort</code> ON)</li>
5270-
<li>Default port</li>
5275+
<li>Default port for the scheme/protocol (such as 80 or 443)</li>
52715276
</ol>
52725277
</dd>
52735278
</dl>
@@ -5455,7 +5460,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/mod/core.html';
54555460
}
54565461
})(window, document);
54575462
//--><!]]></script></div><div id="footer">
5458-
<p class="apache">Copyright 2024 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
5463+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
54595464
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/quickreference.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
54605465
if (typeof(prettyPrint) !== 'undefined') {
54615466
prettyPrint();

docs/manual/mod/mod_http2.html.en.utf8

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@
8181
<li><img alt="" src="../images/down.gif" /> <a href="#h2earlyhint">H2EarlyHint</a></li>
8282
<li><img alt="" src="../images/down.gif" /> <a href="#h2earlyhints">H2EarlyHints</a></li>
8383
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxdataframelen">H2MaxDataFrameLen</a></li>
84+
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxheaderblocklen">H2MaxHeaderBlockLen</a></li>
8485
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxsessionstreams">H2MaxSessionStreams</a></li>
86+
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxstreamerrors">H2MaxStreamErrors</a></li>
8587
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxworkeridleseconds">H2MaxWorkerIdleSeconds</a></li>
8688
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxworkers">H2MaxWorkers</a></li>
8789
<li><img alt="" src="../images/down.gif" /> <a href="#h2minworkers">H2MinWorkers</a></li>
@@ -372,6 +374,28 @@
372374
response data is available, smaller frames will be sent.
373375
</p>
374376

377+
</div>
378+
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
379+
<div class="directive-section"><h2><a name="H2MaxHeaderBlockLen" id="H2MaxHeaderBlockLen">H2MaxHeaderBlockLen</a> <a name="h2maxheaderblocklen" id="h2maxheaderblocklen">Directive</a> <a title="Permanent link" href="#h2maxheaderblocklen" class="permalink">&para;</a></h2>
380+
<table class="directive">
381+
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum size of response headers</td></tr>
382+
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>H2MaxHeaderBlockLen <em>n</em></code></td></tr>
383+
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>H2MaxHeaderBlockLen 0</code></td></tr>
384+
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
385+
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
386+
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_http2</td></tr>
387+
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.5.1 and later.</td></tr>
388+
</table>
389+
<p>
390+
<code class="directive">H2MaxHeaderBlockLen</code> sets the limit
391+
on the overall size of response headers. A setting of 0
392+
will leave this at the default of 64 KB in nghttp2.
393+
</p>
394+
<p>
395+
Responses with headers larger than this (adding all headers)
396+
will not be processed and result in a reset of the stream.
397+
</p>
398+
375399
</div>
376400
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
377401
<div class="directive-section"><h2><a name="H2MaxSessionStreams" id="H2MaxSessionStreams">H2MaxSessionStreams</a> <a name="h2maxsessionstreams" id="h2maxsessionstreams">Directive</a> <a title="Permanent link" href="#h2maxsessionstreams" class="permalink">&para;</a></h2>
@@ -391,6 +415,31 @@
391415
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">H2MaxSessionStreams 20</pre>
392416
</div>
393417

418+
</div>
419+
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
420+
<div class="directive-section"><h2><a name="H2MaxStreamErrors" id="H2MaxStreamErrors">H2MaxStreamErrors</a> <a name="h2maxstreamerrors" id="h2maxstreamerrors">Directive</a> <a title="Permanent link" href="#h2maxstreamerrors" class="permalink">&para;</a></h2>
421+
<table class="directive">
422+
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum amount of client caused errors to tolerate</td></tr>
423+
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>H2MaxStreamErrors <em>n</em></code></td></tr>
424+
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>H2MaxStreamErrors 8</code></td></tr>
425+
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
426+
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
427+
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_http2</td></tr>
428+
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.5.1 and later.</td></tr>
429+
</table>
430+
<p>
431+
<code class="directive">H2MaxStreamErrors</code> sets the maximum amount
432+
of tolerated HTTP/2 stream errors caused by the client.
433+
When exceeding this limit, the connection will be closed.
434+
Stream errors are protocol violations on an individual HTTP/2
435+
stream that do not necessitate a connection close by the
436+
protocol specification, but can be a sign of malicious
437+
activity by a client.
438+
</p>
439+
<p>
440+
Set to 0 to tolerate faulty clients.
441+
</p>
442+
394443
</div>
395444
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
396445
<div class="directive-section"><h2><a name="H2MaxWorkerIdleSeconds" id="H2MaxWorkerIdleSeconds">H2MaxWorkerIdleSeconds</a> <a name="h2maxworkeridleseconds" id="h2maxworkeridleseconds">Directive</a> <a title="Permanent link" href="#h2maxworkeridleseconds" class="permalink">&para;</a></h2>
@@ -1092,7 +1141,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/mod/mod_http2.html
10921141
}
10931142
})(window, document);
10941143
//--><!]]></script></div><div id="footer">
1095-
<p class="apache">Copyright 2023 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
1144+
<p class="apache">Copyright 2025 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
10961145
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/quickreference.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
10971146
if (typeof(prettyPrint) !== 'undefined') {
10981147
prettyPrint();

0 commit comments

Comments
 (0)