Merge branch 'master' into 4.next

diff --git a/src/src/sieve.c b/src/src/sieve.c
index f4ce58402f5e7f7a32e39bd93dff6b24c7f54316..5d6b611c37eecb109e55f1a3e7a5f23ba52e8836 100644 (file)
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -3381,6 +3381,7 @@ while (*filter->pc)
             {
             uschar *mime_body,*reason_end;
             static const uschar nlnl[]="\r\n\r\n";
+           gstring * g;
 
             for
               (