Issue #3410022 by heddn, larowlan, catch: Regression from #3295790 content-length header set earlier than expected (cherry picked from commit 8f087227)
