author | spiralman <spiralman> | 2002-08-02 21:09:06 (UTC) |
---|---|---|
committer | spiralman <spiralman> | 2002-08-02 21:09:06 (UTC) |
commit | b228f8134306f469ec78ae8ab00ea5fdc0853538 (patch) (side-by-side diff) | |
tree | efaedf7f15eb661665a71b678f6a07ce22a25c95 /noncore/net | |
parent | d3a54af5288cd30fc1a4f2dafc9f848b245046d6 (diff) | |
download | opie-b228f8134306f469ec78ae8ab00ea5fdc0853538.zip opie-b228f8134306f469ec78ae8ab00ea5fdc0853538.tar.gz opie-b228f8134306f469ec78ae8ab00ea5fdc0853538.tar.bz2 |
fixed some bugs in chunked encoding stuff, but it still doesnt work. feels very close though...
-rw-r--r-- | noncore/net/ubrowser/httpcomm.cpp | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/noncore/net/ubrowser/httpcomm.cpp b/noncore/net/ubrowser/httpcomm.cpp index b086b58..3c14053 100644 --- a/noncore/net/ubrowser/httpcomm.cpp +++ b/noncore/net/ubrowser/httpcomm.cpp @@ -147,23 +147,24 @@ void HttpComm::incoming() case 0: j = tempQString.find('\n'); sclength = tempQString; sclength.truncate(j); clength = sclength.toUInt(0, 16); printf("HttpComm::Incoming: chunk length: %d\n", clength); + printf("HttpComm::Incoming: chunk length string: %s\n", sclength.latin1()); //end of data if(clength==0) { processBody(); done=true; return; } //still more, but it hasnt been recieved yet if(ba <= j) { - status=1; + status=2; done=true; break; } //still more data waiting else { @@ -184,21 +185,30 @@ void HttpComm::incoming() bRead+=newTQstring.length(); body+=newTQstring; printf("HttpComm::incoming: start new body piece 1: \n"); printf("%s", newTQstring.latin1() ); printf("HttpComm::incoming: end new body piece 1.\n"); status=0; - j=clength-bRead; + tempQString = tempQString.remove(0, clength); done=false; // break; } //the chunk extends beyond the current data; else { - body+=tempQString; - bRead+=tempQString.length(); + if(tempQString.length() <= ba) + { + body+=tempQString; + bRead+=tempQString.length(); + } + else + { + tempQString.truncate(ba); + body+=tempQString; + bRead+=tempQString.length(); + } printf("HttpComm::incoming: start new body piece 2: \n"); printf("%s", tempQString.latin1() ); printf("HttpComm::incoming: end new body piece 2.\n"); done=true; status=2; // break; @@ -214,21 +224,30 @@ void HttpComm::incoming() bRead+=newTQstring.length(); body+=newTQstring; printf("HttpComm::incoming: start new body piece 3: \n"); printf("%s", newTQstring.latin1() ); printf("HttpComm::incoming: end new body piece 3.\n"); status=0; - j=clength-bRead; + tempQString = tempQString.remove(0, clength); done=false; // break; } //the chunk extends beyond the current data; else { - body+=tempQString; - bRead+=tempQString.length(); + if(tempQString.length() <= ba) + { + body+=tempQString; + bRead+=tempQString.length(); + } + else + { + tempQString.truncate(ba); + body+=tempQString; + bRead+=tempQString.length(); + } printf("HttpComm::incoming: start new body piece 4: \n"); printf("%s", tempQString.latin1() ); printf("HttpComm::incoming: end new body piece 4.\n"); done=true; status=2; // break; |