fixed some bugs with chunked transfer encoding, still doesnt work though

3 files changed, 62 insertions, 23 deletions

diff --git a/noncore/net/ubrowser/Makefile b/noncore/net/ubrowser/Makefile
index 4d92441..69aaf20 100644
--- a/noncore/net/ubrowser/Makefile
+++ b/noncore/net/ubrowser/Makefile
@@ -1,3 +1,3 @@
 #############################################################################
-# Automatically generated from noncore/ubrowser/Makefile.in
+# Automatically generated from noncore/net/ubrowser/Makefile.in
 # Build options from 
@@ -107,3 +107,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(OPIEDIR)/include
+        INCPATH =-I../../../include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -115,3 +115,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(OPIEDIR)/bin/
+DESTDIR = ../../../bin/
 VER_MAJ = 1
@@ -208,6 +208,6 @@ REQUIRES=
 main.o: main.cpp \
-                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                ../../../include/qpe/qpeapplication.h \
                 mainview.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                ../../../include/qpe/resource.h \
+                ../../../include/qpe/qpetoolbar.h \
                 httpfactory.h \
@@ -217,4 +217,4 @@ mainview.o: mainview.cpp \
                 mainview.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                ../../../include/qpe/resource.h \
+                ../../../include/qpe/qpetoolbar.h \
                 httpfactory.h \
@@ -231,4 +231,4 @@ moc_mainview.o: moc_mainview.cpp \
                 mainview.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                ../../../include/qpe/resource.h \
+                ../../../include/qpe/qpetoolbar.h \
                 httpfactory.h \
diff --git a/noncore/net/ubrowser/Makefile.in b/noncore/net/ubrowser/Makefile.in
index 010f16f..43b5111 100644
--- a/noncore/net/ubrowser/Makefile.in
+++ b/noncore/net/ubrowser/Makefile.in
@@ -8,3 +8,3 @@ CC	=	$(SYSCONF_CC) $(QT_C_MT)
         CFLAGS  =$(SYSCONF_CFLAGS)
-        INCPATH =-I$(OPIEDIR)/include
+        INCPATH =-I../../../include
         LFLAGS  =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
@@ -16,3 +16,3 @@ UIC	=	$(SYSCONF_UIC)
 
-DESTDIR = $(OPIEDIR)/bin/
+DESTDIR = ../../../bin/
 VER_MAJ = 1
@@ -109,6 +109,6 @@ REQUIRES=
 main.o: main.cpp \
-                $(OPIEDIR)/include/qpe/qpeapplication.h \
+                ../../../include/qpe/qpeapplication.h \
                 mainview.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                ../../../include/qpe/resource.h \
+                ../../../include/qpe/qpetoolbar.h \
                 httpfactory.h \
@@ -118,4 +118,4 @@ mainview.o: mainview.cpp \
                 mainview.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                ../../../include/qpe/resource.h \
+                ../../../include/qpe/qpetoolbar.h \
                 httpfactory.h \
@@ -132,4 +132,4 @@ moc_mainview.o: moc_mainview.cpp \
                 mainview.h \
-                $(OPIEDIR)/include/qpe/resource.h \
-                $(OPIEDIR)/include/qpe/qpetoolbar.h \
+                ../../../include/qpe/resource.h \
+                ../../../include/qpe/qpetoolbar.h \
                 httpfactory.h \
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;
+                                                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);
                         }