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.

64 lines
3.2 KiB

  1. From 20850d19250eb530cab889bb9059a630b3f805a3 Mon Sep 17 00:00:00 2001
  2. From: Willy Tarreau <w@1wt.eu>
  3. Date: Tue, 18 Jul 2017 06:56:40 +0200
  4. Subject: [PATCH 06/18] DOC: update CONTRIBUTING regarding optional parts and
  5. message format
  6. Make it clear that optional components must not break when disabled,
  7. that openssl is the only officially supported library and its support
  8. must not be broken, and that bug fixes must always be detailed.
  9. (cherry picked from commit 9d84cd602f4adb3954209eb14c94eea9254d1b5b)
  10. Signed-off-by: Willy Tarreau <w@1wt.eu>
  11. ---
  12. CONTRIBUTING | 21 ++++++++++++++++++++-
  13. 1 file changed, 20 insertions(+), 1 deletion(-)
  14. diff --git a/CONTRIBUTING b/CONTRIBUTING
  15. index 74a099bc..b2c2b493 100644
  16. --- a/CONTRIBUTING
  17. +++ b/CONTRIBUTING
  18. @@ -69,6 +69,16 @@ code :
  19. Since most of these restrictions are just a matter of coding style, it is
  20. normally not a problem to comply.
  21. +When modifying some optional subsystem (SSL, Lua, compression, device detection
  22. +engines), please make sure the code continues to build (and to work) when these
  23. +features are disabled. Similarly, when modifying the SSL stack, please always
  24. +ensure that supported OpenSSL versions continue to build and to work, especially
  25. +if you modify support for alternate libraries. Clean support for the legacy
  26. +OpenSSL libraries is mandatory, support for its derivatives is a bonus and may
  27. +occasionally break eventhough a great care is taken. In other words, if you
  28. +provide a patch for OpenSSL you don't need to test its derivatives, but if you
  29. +provide a patch for a derivative you also need to test with OpenSSL.
  30. +
  31. If your work is very confidential and you can't publicly discuss it, you can
  32. also mail willy@haproxy.org directly about it, but your mail may be waiting
  33. several days in the queue before you get a response, if you get a response at
  34. @@ -441,13 +451,22 @@ do not think about them anymore after a few patches.
  35. way the subject is built. Please see the section below for more information
  36. regarding this formatting.
  37. - As a rule of thumb, your patch must never be made only of a subject line,
  38. + As a rule of thumb, your patch MUST NEVER be made only of a subject line,
  39. it *must* contain a description. Even one or two lines, or indicating
  40. whether a backport is desired or not. It turns out that single-line commits
  41. are so rare in the Git world that they require special manual (hence
  42. painful) handling when they are backported, and at least for this reason
  43. it's important to keep this in mind.
  44. + Each patch fixing a bug MUST be tagged with "BUG", a severity level, an
  45. + indication of the affected subsystem and a brief description of the nature
  46. + of the issue in the subject line, and a detailed analysis in the message
  47. + body. The explanation of the user-visible impact and the need for
  48. + backporting to stable branches or not are MANDATORY. Bug fixes with no
  49. + indication will simply be rejected as they are very likely to cause more
  50. + harm when nobody is able to tell whether or not the patch needs to be
  51. + backported or can be reverted in case of regression.
  52. +
  53. 12) Discuss on the mailing list
  54. When submitting changes, please always CC the mailing list address so that
  55. --
  56. 2.13.0