Issue #26657: Merge http.server fix from 3.5