Skip to content

Commit 1dc049f

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents d373d13 + bba9304 commit 1dc049f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

UPGRADING

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ PHP 8.0 UPGRADE NOTES
4949

5050
// Replace
5151
function my_error_handler($err_no, $err_msg, $filename, $linenum) {
52-
if (error_reporting() == 0)
52+
if (error_reporting() == 0) {
5353
return; // Silenced
5454
}
5555
// ...
5656
}
5757

5858
// With
5959
function my_error_handler($err_no, $err_msg, $filename, $linenum) {
60-
if (error_reporting() & $err_no)
60+
if (error_reporting() & $err_no) {
6161
return; // Silenced
6262
}
6363
// ...

Zend/zend_list.c

+1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ void plist_entry_destructor(zval *zv)
209209
int zend_init_rsrc_list(void)
210210
{
211211
zend_hash_init(&EG(regular_list), 8, NULL, list_entry_destructor, 0);
212+
EG(regular_list).nNextFreeElement = 0;
212213
return SUCCESS;
213214
}
214215

0 commit comments

Comments
 (0)