Merge branch 'master' into 4.next

diff --cc src/src/pdkim/pdkim.c
index a099f94b00d61c66e989f2e0a859367e8c2666f2,789d650e6530f653e2bcfd9a6d0d1439195de6be..2d5f621b4da6c9ba16dc97d01741bc68eb6ef604
--- 1/src/src/pdkim/pdkim.c
--- 2/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@@ -1471,16 -1443,14 +1443,10 @@@ if (  pdkim_headcat(&col, hdr, ";", "a=
  
        if (!i)
        if (!pdkim_headcat(&col, hdr, NULL, NULL, ":"))
--        {
-         free(f);
          goto BAIL;
--        }
  
        if (!pdkim_headcat(&col, hdr, s, i, n))
--      {
-       free(f);
        goto BAIL;
--      }
  
        if (!c)
          break;
@@@ -1507,7 -1476,7 +1472,7 @@@
      snprintf(minibuf, 20, "%lu", sig->created);
      if(!pdkim_headcat(&col, hdr, ";", "t=", minibuf))
        goto BAIL;
--  }
++    }
  
    if (sig->expires > 0)
      {
@@@ -1534,7 -1503,7 +1499,7 @@@
        goto BAIL;
      if (!pdkim_headcat(&col, hdr, ";", "b=", base64_b))
        goto BAIL;
--  }
++    }
    else 
      if(!pdkim_headcat(&col, hdr, ";", "b=", ""))
        goto BAIL;