]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6913ec3) | patch
Fix FPM timer event re-registration
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 23 Jul 2019 13:54:35 +0000 (15:54 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 30 Jul 2019 08:16:57 +0000 (10:16 +0200)
commit0ed6c3714087b254c49185568df96a31df76b2ce
treec915adb3b08b83bc3180079c2c6f926b646aa090tree | snapshot
parent6913ec3282149914e999d91b056fe1cc68d15ed7commit | diff
Fix FPM timer event re-registration

Make sure that fpm_event_add calls inside a timer callback work by
unregistering the event from the queue before invoking its callback.

The read timeout in tester.inc is increased because the added test
needs two seconds (one for SIGTERM, one for SIGKILL) until the
reload succeeds, so we should wait longer than that for a response.
sapi/fpm/fpm/fpm_events.c diff | blob | history
sapi/fpm/tests/reload-uses-sigkill-as-last-measure.phpt [new file with mode: 0644] blob
sapi/fpm/tests/tester.inc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.