Fix header name normalization logic

[libs/net.git] / source / http / message.cpp

diff --git a/source/http/message.cpp b/source/http/message.cpp
index 5d5dd2123939013fdf5d02ace2907cdaa8d3f16a..b86f95495eb267639bbc1bdf9ee58662dd198bf1 100644 (file)
--- a/source/http/message.cpp
+++ b/source/http/message.cpp
@@ -51,8 +51,8 @@ unsigned Message::parse_content(const string &d)
        HeaderMap::const_iterator i = headers.find("Content-Length");
        if(i!=headers.end())
        {
-               unsigned needed = lexical_cast<unsigned>(i->second)-content.size();
-               unsigned len = min(needed, d.size());
+               string::size_type needed = lexical_cast<string::size_type>(i->second)-content.size();
+               string::size_type len = min(needed, d.size());
                
                content.append(d, 0, len);
 
@@ -65,12 +65,12 @@ unsigned Message::parse_content(const string &d)
        i = headers.find("Transfer-Encoding");
        if(i!=headers.end() && strcasecmp(i->second, "chunked")==0)
        {
-               unsigned pos = 0;
+               string::size_type pos = 0;
                while(!complete && pos<d.size())
                {
                        if(chunk_length==0)
                        {
-                               unsigned lf = d.find('\n', pos);
+                               string::size_type lf = d.find('\n', pos);
                                if(lf==string::npos)
                                        return pos;
                                chunk_length = lexical_cast<unsigned>(strip(d.substr(pos, lf-pos)), "x");
@@ -80,7 +80,7 @@ unsigned Message::parse_content(const string &d)
                        }
                        else
                        {
-                               unsigned len = min(chunk_length, d.size()-pos);
+                               string::size_type len = min(chunk_length, d.size()-pos);
                                content.append(d, pos, len);
                                chunk_length -= len;
                                if((pos = d.find('\n', pos+len))!=string::npos)
@@ -97,16 +97,16 @@ unsigned Message::parse_content(const string &d)
 
 unsigned Message::parse_headers(const string &d)
 {
-       unsigned start = 0;
+       string::size_type start = 0;
        while(1)
        {
-               unsigned lf = d.find('\n', start);
+               string::size_type lf = d.find('\n', start);
                if(lf==string::npos)
                        throw invalid_argument("Message::parse_headers");
                if(lf==start || (d[start]=='\r' && lf==start+1))
                        return lf+1;
 
-               unsigned colon = d.find(':', start);
+               string::size_type colon = d.find(':', start);
                if(colon>lf)
                        throw invalid_argument("Message::parse_headers");
 
@@ -135,13 +135,13 @@ string Message::normalize_header_name(const string &hdr) const
        bool upper = true;
        for(string::iterator i=result.begin(); i!=result.end(); ++i)
        {
-               if(upper)
+               if(*i=='-')
+                       upper = true;
+               else if(upper)
                {
                        *i = toupper(*i);
                        upper = false;
                }
-               else if(*i=='-')
-                       upper = true;
                else
                        *i = tolower(*i);
        }