Commit 3454b5c

committed

shutdown ZendMM observers during request shutdown

1 parent 0ed7968 commit 3454b5cCopy full SHA for 3454b5c

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2269,6 +2269,10 @@ void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)`
`2269`	`2269`	`zend_mm_chunk *p;`
`2270`	`2270`	`zend_mm_huge_list *list;`
`2271`	`2271`
	`2272`	`+ if (full == false) {`
	`2273`	`+ zend_mm_observers_shutdown(heap);`
	`2274`	`+ }`
	`2275`	`+`
`2272`	`2276`	`#if ZEND_MM_CUSTOM`
`2273`	`2277`	`if (heap->use_custom_heap & ~ZEND_MM_CUSTOM_HEAP_OBSERVED) {`
`2274`	`2278`	`if (heap->custom_heap.std._malloc == tracked_malloc) {`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2341,9 +2341,6 @@ void php_module_shutdown(void)`
`2341`	`2341`	`return;`
`2342`	`2342`	`}`
`2343`	`2343`
`2344`		`- // we need to shutdown ZendMM observers before modules are unloaded`
`2345`		`- zend_mm_observers_shutdown(NULL);`
`2346`		`-`
`2347`	`2344`	`zend_interned_strings_switch_storage(0);`
`2348`	`2345`
`2349`	`2346`	`#if ZEND_RC_DEBUG`

Comments

(0)