Issue #26586: Merge excessive HTTP header handling from 3.5