Skip to content

Commit c131203

Browse files
author
HAProxy Community
committed
Update docs for 2.6
1 parent 716066d commit c131203

File tree

3 files changed

+64
-15
lines changed

3 files changed

+64
-15
lines changed

docs/2.6/configuration.html

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>HAProxy version 2.6.20-2 - Configuration Manual</title>
5+
<title>HAProxy version 2.6.20-37 - Configuration Manual</title>
66
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />
77
<link href="https://raw.githubusercontent.com/thomaspark/bootswatch/v3.3.7/cerulean/bootstrap.min.css" rel="stylesheet" />
88
<link href="../css/page.css?0.4.2-15" rel="stylesheet" />
@@ -4145,7 +4145,7 @@
41454145
You can use <strong>left</strong> and <strong>right</strong> arrow keys to navigate between chapters.<br>
41464146
</p>
41474147
<p class="text-right">
4148-
<small>Converted with <a href="https://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>0.4.2-15</b> on <b>2024/11/08</b></small>
4148+
<small>Converted with <a href="https://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>0.4.2-15</b> on <b>2025/01/09</b></small>
41494149
</p>
41504150
</div>
41514151
<!-- /.sidebar -->
@@ -4156,7 +4156,7 @@
41564156
<div class="text-center">
41574157
<h1><a href="http://www.haproxy.org/" title="HAProxy"><img src="../img/HAProxyCommunityEdition_60px.png?0.4.2-15" /></a></h1>
41584158
<h2>Configuration Manual</h2>
4159-
<p><strong>version 2.6.20-2</strong></p>
4159+
<p><strong>version 2.6.20-37</strong></p>
41604160
<p>
41614161
2024/11/08<br>
41624162

@@ -5997,6 +5997,54 @@ <h2 id="chapter-2.4" data-target="2.4"><small><a class="small" href="#2.4">2.4.<
59975997
- expressions combined with a logical OR ('||'), which will be evaluated
59985998
from right to left until one returns true
59995999

6000+
The same line tokenizer and argument parser are used as for the rest of the
6001+
configuration language. Words are split around consecutive series of one or
6002+
more unquoted spaces or tabs, and are reassembled together using a single space
6003+
to delimit them before evaluation, in order to save the user from having to
6004+
quote the entire line. But this also means that spaces surrounding commas or
6005+
parenthesis are definitely part of the value, which is not always expected.
6006+
For example, the expression below:
6007+
6008+
.if defined( HAPROXY_MWORKER )
6009+
6010+
will test for the existence of variable &quot; HAPROXY_MWORKER &quot; (with spaces),
6011+
and this one:
6012+
6013+
.if streq(&quot;$ENABLE_SSL&quot;, 1)
6014+
6015+
will compare the environment variable &quot;ENABLE_SSL&quot; to the value &quot; 1&quot; (with a
6016+
single leading space). The reason is the line is first split into words like
6017+
this:
6018+
6019+
.if streq(&quot;$ENABLE_SSL&quot;, 1)
6020+
|---|--------------------| |--|
6021+
1 2 3
6022+
6023+
then the weak quoting is applied and environment variable &quot;$ENABLE_SSL&quot; is
6024+
resolved (let's say for example that ENABLE_SSL=0), and finally the words are
6025+
reassembled into a single string by placing a single space between the words:
6026+
6027+
.if streq(0, 1)
6028+
|---|-------|--|
6029+
1 2 3
6030+
6031+
and only then it is parsed as a single expression. The space that was inserted
6032+
between the comma and &quot;1&quot; is still part of the argument value, making this
6033+
argument &quot; 1&quot;:
6034+
6035+
.if streq(0, 1)
6036+
|---|-----|-|--|
6037+
\ \ \ \_ argument2: &quot; 1&quot;
6038+
\ \ \___ argument1: &quot;0&quot;
6039+
\ \_______ function: &quot;streq&quot;
6040+
\___________ directive: &quot;.if&quot;
6041+
6042+
It's visible here that even if ENABLE_SSL had been equal to &quot;1&quot;, it wouldn't
6043+
have matched &quot; 1&quot; since the string would differ by one space.
6044+
6045+
Note: as explained in section &quot;2.2. Quoting and escaping&quot;, a good rule of thumb
6046+
is to never insert unneeded spaces inside expressions.
6047+
60006048
Note that like in other languages, the AND operator has precedence over the OR
60016049
operator, so that &quot;A &amp;&amp; B || C &amp;&amp; D&quot; evalues as &quot;(A &amp;&amp; B) || (C &amp;&amp; D)&quot;.
60026050

@@ -25204,9 +25252,10 @@ <h2 id="chapter-8.4" data-target="8.4"><small><a class="small" href="#8.4">8.4.<
2520425252
instance during a POST request, the time already runs, and this can distort
2520525253
apparent response time. For this reason, it's generally wise not to trust
2520625254
too much this field for POST requests initiated from clients behind an
25207-
untrusted network. A value of &quot;-1&quot; here means that the last the response
25208-
header (empty line) was never seen, most likely because the server timeout
25209-
stroke before the server managed to process the request.
25255+
untrusted network. A value of &quot;-1&quot; here means that the last response header
25256+
(empty line) was never seen, most likely because the server timeout stroke
25257+
before the server managed to process the request or because the server
25258+
returned an invalid response.
2521025259

2521125260
- Td: this is the total transfer time of the response payload till the last
2521225261
byte sent to the client. In HTTP it starts after the last response header
@@ -26455,7 +26504,7 @@ <h2 id="chapter-11.3" data-target="11.3"><small><a class="small" href="#11.3">11
2645526504
<br>
2645626505
<hr>
2645726506
<div class="text-right">
26458-
HAProxy 2.6.20-2 &ndash; Configuration Manual<br>
26507+
HAProxy 2.6.20-37 &ndash; Configuration Manual<br>
2645926508
<small>, 2024/11/08</small>
2646026509
</div>
2646126510
</div>

docs/2.6/intro.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>HAProxy version 2.6.20-2 - Starter Guide</title>
5+
<title>HAProxy version 2.6.20-37 - Starter Guide</title>
66
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />
77
<link href="https://raw.githubusercontent.com/thomaspark/bootswatch/v3.3.7/cerulean/bootstrap.min.css" rel="stylesheet" />
88
<link href="../css/page.css?0.4.2-15" rel="stylesheet" />
@@ -484,7 +484,7 @@
484484
You can use <strong>left</strong> and <strong>right</strong> arrow keys to navigate between chapters.<br>
485485
</p>
486486
<p class="text-right">
487-
<small>Converted with <a href="https://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>0.4.2-15</b> on <b>2024/11/08</b></small>
487+
<small>Converted with <a href="https://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>0.4.2-15</b> on <b>2025/01/09</b></small>
488488
</p>
489489
</div>
490490
<!-- /.sidebar -->
@@ -495,7 +495,7 @@
495495
<div class="text-center">
496496
<h1><a href="http://www.haproxy.org/" title="HAProxy"><img src="../img/HAProxyCommunityEdition_60px.png?0.4.2-15" /></a></h1>
497497
<h2>Starter Guide</h2>
498-
<p><strong>version 2.6.20-2</strong></p>
498+
<p><strong>version 2.6.20-37</strong></p>
499499
<p>
500500
<br>
501501

@@ -2515,7 +2515,7 @@ <h2 id="chapter-4.4" data-target="4.4"><small><a class="small" href="#4.4">4.4.<
25152515
<br>
25162516
<hr>
25172517
<div class="text-right">
2518-
HAProxy 2.6.20-2 &ndash; Starter Guide<br>
2518+
HAProxy 2.6.20-37 &ndash; Starter Guide<br>
25192519
<small>, </small>
25202520
</div>
25212521
</div>

docs/2.6/management.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>HAProxy version 2.6.20-2 - Management Guide</title>
5+
<title>HAProxy version 2.6.20-37 - Management Guide</title>
66
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />
77
<link href="https://raw.githubusercontent.com/thomaspark/bootswatch/v3.3.7/cerulean/bootstrap.min.css" rel="stylesheet" />
88
<link href="../css/page.css?0.4.2-15" rel="stylesheet" />
@@ -592,7 +592,7 @@
592592
You can use <strong>left</strong> and <strong>right</strong> arrow keys to navigate between chapters.<br>
593593
</p>
594594
<p class="text-right">
595-
<small>Converted with <a href="https://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>0.4.2-15</b> on <b>2024/11/08</b></small>
595+
<small>Converted with <a href="https://github.com/cbonte/haproxy-dconv">haproxy-dconv</a> v<b>0.4.2-15</b> on <b>2025/01/09</b></small>
596596
</p>
597597
</div>
598598
<!-- /.sidebar -->
@@ -603,7 +603,7 @@
603603
<div class="text-center">
604604
<h1><a href="http://www.haproxy.org/" title="HAProxy"><img src="../img/HAProxyCommunityEdition_60px.png?0.4.2-15" /></a></h1>
605605
<h2>Management Guide</h2>
606-
<p><strong>version 2.6.20-2</strong></p>
606+
<p><strong>version 2.6.20-37</strong></p>
607607
<p>
608608
<br>
609609

@@ -4716,7 +4716,7 @@ <h3 id="chapter-9.4.1" data-target="9.4.1"><small><a class="small" href="#9.4.1"
47164716
<br>
47174717
<hr>
47184718
<div class="text-right">
4719-
HAProxy 2.6.20-2 &ndash; Management Guide<br>
4719+
HAProxy 2.6.20-37 &ndash; Management Guide<br>
47204720
<small>, </small>
47214721
</div>
47224722
</div>

0 commit comments

Comments
 (0)