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
@@ -141,35 +141,36 @@ void HttpComm::incoming()
                         }
                         while(!done)
                         {
                                 switch(status)
                                 {
                                 //case 0=need to read chunk length
                                 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
                                         {
                                                 done=false;
                                                 //remove the chunk length header
                                                 tempQString.remove(0,j+1);
                                         }
                                         bRead=0;
         //                              break;
@@ -178,63 +179,81 @@ void HttpComm::incoming()
                                 case 1:
                                         //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 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;
                                         }
                                         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;
+                                                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;
                                         }
                                         break;
                                 }
                                 printf("HttpComm::incoming: chunked encoding: bRead: %d\n", bRead);
                         }
                 }