From 8352f00261de0d8220e0d8023d8e0a0527909edf Mon Sep 17 00:00:00 2001 From: Remi Tricot-Le Breton Date: Fri, 23 Jun 2023 17:01:08 +0200 Subject: [PATCH] DOC: ssl: Fix typo in 'ocsp-update' option This patch fixes a misalignment in the 'ocsp-update' option description and it splits the example log lines for readability. Must be backported in 2.8. --- doc/configuration.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index f8fe49ae2..984ad730b 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -15332,17 +15332,20 @@ ocsp-update [ off | on ] HTTP log format in case of error (unreachable OCSP responder for instance). If such an error occurs, another log line that contains HTTP-related information will then be emitted alongside the "regular" OCSP one (which will - likely have "HTTP error" as text status). - - but if a purely HTTP error happens + likely have "HTTP error" as text status). But if a purely HTTP error happens (unreachable OCSP responder for instance), an extra log line that follows the regular HTTP log-format will be emitted. - Here are two examples of such log lines, with a successful OCSP update log line first - and then an example of an HTTP error with the two different lines: - <134>Mar 6 11:16:53 haproxy[14872]: -:- [06/Mar/2023:11:16:52.808] /path_to_cert/foo.pem 1 "Update successful" 0 1 + Here are two examples of such log lines, with a successful OCSP update log + line first and then an example of an HTTP error with the two different lines + (lines were spit and the URL was shortened for readability): + <134>Mar 6 11:16:53 haproxy[14872]: -:- [06/Mar/2023:11:16:52.808] \ + /path_to_cert/foo.pem 1 "Update successful" 0 1 - <134>Mar 6 11:18:55 haproxy[14872]: -:- [06/Mar/2023:11:18:54.207] /path_to_cert/bar.pem 2 "HTTP error" 1 0 - <134>Mar 6 11:18:55 haproxy[14872]: -:- [06/Mar/2023:11:18:52.200] -/- 2/0/-1/-1/3009 503 217 - - SC-- 0/0/0/0/3 0/0 {} "GET http://127.0.0.1:12345/MEMwQTA%2FMD0wOzAJBgUrDgMCGgUABBSKg%2BAGD6%2F3Ccp%2Bm5VSKi6BY1%2FaCgQU9lKw5DXV6pI4UVCPCtvpLYXeAHoCAhAV HTTP/1.1" + <134>Mar 6 11:18:55 haproxy[14872]: -:- [06/Mar/2023:11:18:54.207] \ + /path_to_cert/bar.pem 2 "HTTP error" 1 0 + <134>Mar 6 11:18:55 haproxy[14872]: -:- [06/Mar/2023:11:18:52.200] \ + -/- 2/0/-1/-1/3009 503 217 - - SC-- 0/0/0/0/3 0/0 {} \ + "GET http://127.0.0.1:12345/MEMwQT HTTP/1.1" prefer-client-ciphers Use the client's preference when selecting the cipher suite, by default