Merge branch 'PHP-8.0'

Girgias · Girgias · commit 77d14477dbc5 · 2020-10-22T17:06:07.000+01:00
* PHP-8.0:
  Fix bug 76618
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -867,7 +867,7 @@ PHP_FUNCTION(imap_reopen)
 
 	imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, ZSTR_VAL(mailbox), flags);
 	if (imap_le_struct->imap_stream == NIL) {
-		zend_list_delete(Z_RES_P(streamind));
+		zend_list_close(Z_RES_P(streamind));
 		php_error_docref(NULL, E_WARNING, "Couldn't re-open stream");
 		RETURN_FALSE;
 	}

Original file line number	Diff line number	Diff line change
`@@ -867,7 +867,7 @@ PHP_FUNCTION(imap_reopen)`
`867`	`867`
`868`	`868`	`imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, ZSTR_VAL(mailbox), flags);`
`869`	`869`	`if (imap_le_struct->imap_stream == NIL) {`
`870`		`- zend_list_delete(Z_RES_P(streamind));`
	`870`	`+ zend_list_close(Z_RES_P(streamind));`
`871`	`871`	`php_error_docref(NULL, E_WARNING, "Couldn't re-open stream");`
`872`	`872`	`RETURN_FALSE;`
`873`	`873`	`}`