mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'master' into preload
* master: Fixed reseting of interned strings buffer.
This commit is contained in:
commit
d9fc51bc3b
1 changed files with 3 additions and 0 deletions
|
@ -384,6 +384,9 @@ static void accel_interned_strings_restore_state(void)
|
||||||
memset(ZCSG(interned_strings).saved_top,
|
memset(ZCSG(interned_strings).saved_top,
|
||||||
0, (char*)ZCSG(interned_strings).top - (char*)ZCSG(interned_strings).saved_top);
|
0, (char*)ZCSG(interned_strings).top - (char*)ZCSG(interned_strings).saved_top);
|
||||||
|
|
||||||
|
/* Reset "top" */
|
||||||
|
ZCSG(interned_strings).top = ZCSG(interned_strings).saved_top;
|
||||||
|
|
||||||
/* rehash */
|
/* rehash */
|
||||||
memset((char*)&ZCSG(interned_strings) + sizeof(zend_string_table),
|
memset((char*)&ZCSG(interned_strings) + sizeof(zend_string_table),
|
||||||
STRTAB_INVALID_POS,
|
STRTAB_INVALID_POS,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue