From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 25 Jun 2019 12:30:24 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1479fbbd9d4ad53fb6b0ed027548ea078558f5b;p=php

Merge branch 'PHP-7.4'
---

a1479fbbd9d4ad53fb6b0ed027548ea078558f5b
diff --cc Zend/zend_list.c
index 10293753bd,21d013a589..2288cf6913
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@@ -206,10 -206,9 +206,10 @@@ void plist_entry_destructor(zval *zv
  	free(res);
  }
  
- int zend_init_rsrc_list(void)
+ ZEND_API int zend_init_rsrc_list(void)
  {
  	zend_hash_init(&EG(regular_list), 8, NULL, list_entry_destructor, 0);
 +	EG(regular_list).nNextFreeElement = 0;
  	return SUCCESS;
  }