summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2018-04-14 13:06:00 +0200
committerNikita Popov <nikita.ppv@gmail.com>2018-04-14 13:06:00 +0200
commitac732d75bdbb8cff3c2d70ce5e530e1a5faa9dc1 (patch)
treef5ab28beb7e4a32f0b657a1062924b2496576814
parentb8aec1e7254cd6868d0b7c42c338cf25d2df6f98 (diff)
parent9090a21de0b0229dbb05e835bb9bbcb890cec932 (diff)
downloadphp-git-ac732d75bdbb8cff3c2d70ce5e530e1a5faa9dc1.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
-rw-r--r--ext/imap/php_imap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 4f5cefdbb4..e1adcf2264 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1082,6 +1082,7 @@ PHP_RSHUTDOWN_FUNCTION(imap)
}
}
mail_free_errorlist(&IMAPG(imap_errorstack));
+ IMAPG(imap_errorstack) = NIL;
}
if (IMAPG(imap_alertstack) != NIL) {