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.

31 lines
941 B

  1. From 3a011f15a8d61cd0088cc0e46743bdc7699db1af Mon Sep 17 00:00:00 2001
  2. From: Lukas Tribus <luky-37@hotmail.com>
  3. Date: Mon, 12 Sep 2016 21:42:00 +0000
  4. Subject: [PATCH 02/26] BUG/MINOR: displayed PCRE version is running release
  5. pcre_version() returns the running PCRE release, not the release
  6. haproxy was built with.
  7. This simple string fix should be backported to supported releases,
  8. as the output may be confusing.
  9. (cherry picked from commit d64788d9c610163756cac6c91220875e51cba3ef)
  10. ---
  11. src/haproxy.c | 2 +-
  12. 1 file changed, 1 insertion(+), 1 deletion(-)
  13. diff --git a/src/haproxy.c b/src/haproxy.c
  14. index d70cf63..44d32b9 100644
  15. --- a/src/haproxy.c
  16. +++ b/src/haproxy.c
  17. @@ -347,7 +347,7 @@ void display_build_opts()
  18. #endif
  19. #ifdef USE_PCRE
  20. - printf("Built with PCRE version : %s", pcre_version());
  21. + printf("Running on PCRE version : %s", pcre_version());
  22. printf("\nPCRE library supports JIT : ");
  23. #ifdef USE_PCRE_JIT
  24. {
  25. --
  26. 2.7.3