File tree Expand file tree Collapse file tree 2 files changed +12
-10
lines changed
Expand file tree Collapse file tree 2 files changed +12
-10
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,6 @@ HashTable *main_thread_env = NULL;
8686__thread uintptr_t thread_index ;
8787__thread bool is_worker_thread = false;
8888__thread HashTable * sandboxed_env = NULL ;
89- __thread zval * os_environment = NULL ;
9089zif_handler orig_opcache_reset ;
9190
9291/* Forward declaration */
Original file line number Diff line number Diff line change @@ -777,16 +777,19 @@ func restartThreadsAndOpcacheReset(withRegularThreads bool) {
777777
778778 threadsToRestart := drainThreads (withRegularThreads )
779779
780- opcacheResetOnce = sync.Once {}
781- opcacheResetWg := sync.WaitGroup {}
782- for _ , thread := range threadsToRestart {
783- thread .state .Set (state .OpcacheResetting )
784- opcacheResetWg .Go (func () {
785- thread .state .WaitFor (state .OpcacheResettingDone )
786- })
787- }
780+ // on 8.2 debian it segfaults, skip opcache reset
781+ if Version ().VersionID >= 80300 {
782+ opcacheResetOnce = sync.Once {}
783+ opcacheResetWg := sync.WaitGroup {}
784+ for _ , thread := range threadsToRestart {
785+ thread .state .Set (state .OpcacheResetting )
786+ opcacheResetWg .Go (func () {
787+ thread .state .WaitFor (state .OpcacheResettingDone )
788+ })
789+ }
788790
789- opcacheResetWg .Wait ()
791+ opcacheResetWg .Wait ()
792+ }
790793
791794 for _ , thread := range threadsToRestart {
792795 thread .drainChan = make (chan struct {})
You can’t perform that action at this time.
0 commit comments