Diffstat (limited to 'noncore/net/ubrowser/httpcomm.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/ubrowser/httpcomm.cpp | 49 |
1 files changed, 44 insertions, 5 deletions
diff --git a/noncore/net/ubrowser/httpcomm.cpp b/noncore/net/ubrowser/httpcomm.cpp index 51068db..54f7acf 100644 --- a/noncore/net/ubrowser/httpcomm.cpp +++ b/noncore/net/ubrowser/httpcomm.cpp @@ -138,3 +138,4 @@ void HttpComm::incoming() { - tempQString.remove(0, j); + tempQString.remove(0, j+1); + printf("HttpComm::incoming: removing http header. Result: \n%s", tempQString.latin1()); } @@ -151,2 +152,3 @@ void HttpComm::incoming() printf("HttpComm::Incoming: chunk length: %d\n", clength); + //end of data if(clength==0) @@ -156,2 +158,3 @@ void HttpComm::incoming() } + //still more, but it hasnt been recieved yet if(ba <= j) @@ -160,4 +163,5 @@ void HttpComm::incoming() done=true; -// break; + break; } + //still more data waiting else @@ -165,5 +169,7 @@ void HttpComm::incoming() done=false; + //remove the chunk length header + tempQString.remove(0,j+1); } bRead=0; - break; +// break; //if there is more fall through to: @@ -176,2 +182,3 @@ void HttpComm::incoming() newTQstring.truncate(clength-bRead); + bRead+=newTQstring.length(); body+=newTQstring; @@ -183,3 +190,3 @@ void HttpComm::incoming() done=false; - break; +// break; } @@ -194,3 +201,34 @@ void HttpComm::incoming() done=true; - break; + status=2; +// break; + } + break; + //just got data in, continue reading chunk + case 2: + //the current data extends beyond the end of the chunk + if(bRead + tempQString.length() > clength) + { + QString newTQstring = tempQString; + newTQstring.truncate(clength-bRead); + 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; + done=false; +// break; + } + //the chunk extends beyond the current data; + else + { + body+=tempQString; + bRead+=ba; + 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; } @@ -198,2 +236,3 @@ void HttpComm::incoming() } + printf("HttpComm::incoming: chunked encoding: bRead: %d\n", bRead); } |