You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

26 lines
1.3 KiB

  1. commit 6e9787fcc677b15cb9fc0baea8de545127b4fb85
  2. Author: Freddy Spierenburg <freddy@snarl.nl>
  3. Date: Mon Mar 25 14:35:17 2019 +0100
  4. DOC: The option httplog is no longer valid in a backend.
  5. This can be backported to 1.9 and 1.8.
  6. (cherry picked from commit e88b77351b3fe34a83d5208773a63f78fb140722)
  7. Signed-off-by: Willy Tarreau <w@1wt.eu>
  8. (cherry picked from commit 79b70b0f8f86315230323e7f826796dffba4b85b)
  9. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  10. diff --git a/doc/configuration.txt b/doc/configuration.txt
  11. index 8d75d568..3608a897 100644
  12. --- a/doc/configuration.txt
  13. +++ b/doc/configuration.txt
  14. @@ -2118,7 +2118,7 @@ option http-tunnel (*) X X X X
  15. option http-use-proxy-header (*) X X X -
  16. option httpchk X - X X
  17. option httpclose (*) X X X X
  18. -option httplog X X X X
  19. +option httplog X X X -
  20. option http_proxy (*) X X X X
  21. option independent-streams (*) X X X X
  22. option ldap-check X - X X