Correctly parse content-type headers with 'boundary="foo" ; type="text/html"'

@bpot Would you mind reviewing this change?