Issue #23735: Merge sighandler_t fix from 3.5