Issue #25738: Merge HTTP server from 3.5