Issues #25232, #24657: Merge two CGI server fixes from 3.5