William,

as a heads up, this part of the commit message:

On 1/6/22 4:57 PM, William Dauchy wrote:
The alternative solution was to restore the previous state, but I
believe this will create even more confusion in the future:

--- a/src/server.c
+++ b/src/server.c
@@ -2113,8 +2113,11 @@ void srv_set_ssl(struct server *s, int use_ssl)
                 return;

         s->use_ssl = use_ssl;
-       if (s->use_ssl)
+       if (use_ssl) {
                 s->xprt = xprt_get(XPRT_SSL);
+               if (s->check.use_ssl)
+                       s->check.xprt = s->agent.xprt = xprt_get(XPRT_SSL);
+       }
         else
                 s->xprt = s->check.xprt = s->agent.xprt = xprt_get(XPRT_RAW);
  }

Causes issues when applying the patch, because git gets confused and believes this to be the patch.

I tend to indent this type of "literal code block" within my commit message with 4 spaces for clarity.

Best regards
Tim Düsterhus

Reply via email to