Set content-length
Merge pull request #1018 from andrerod/dev

Set content-length