As a follow-up to !11 (merged) and !12 (merged), here are more fixes to the HTTP implementation the upstream has written.