Merge branch 'upstream-openssl'

This commit is contained in:
Jeff Becker 2016-06-30 07:36:14 -04:00
commit ac59d9e1b6
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
60 changed files with 1085 additions and 879 deletions

View file

@ -280,7 +280,7 @@ namespace http {
return false;
}
long int HTTPMsg::length() {
long int HTTPMsg::content_length() {
unsigned long int length = 0;
auto it = headers.find("Content-Length");
if (it == headers.end())