Merge pull request #3695 from Karlson2k/http_header_rfc2616