removed infinite loop with chunked encoding

fixed generation of context for http requests (QTextBrowser still ignores them)
chunked encoding still misses large portions of data...

3 files changed, 9 insertions, 6 deletions

diff --git a/noncore/net/ubrowser/httpcomm.cpp b/noncore/net/ubrowser/httpcomm.cpp
index 54f7acf..b086b58 100644
--- a/noncore/net/ubrowser/httpcomm.cpp
+++ b/noncore/net/ubrowser/httpcomm.cpp
@@ -110,186 +110,189 @@ void HttpComm::incoming()
                         if(j != 0)
                         {
                                 for( ; j<ba ; j++)
                                 {
                                         body+=tempString[j];
                                         bRead++;
         //                      printf("bRead1: %d\n", bRead);
                                 }
                         }
                         else
                         {
                                 body += tempString;
                                 bRead+=ba;
         //                      printf("bRead2: %d\n", bRead);
                         }
 
                         if(bRead >= length)
                         {
                                 printf("HttpComm::incoming: finished reading body\n");
                                 processBody();
                                 socket->close();
                         }
                 }
                 else
                 {
                         QString tempQString = tempString;
                         //remove the http header, if one exists
                         if(j != 0)
                         {
                                 tempQString.remove(0, j+1);
                                 printf("HttpComm::incoming: removing http header.  Result: \n%s", tempQString.latin1());
                         }
                         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);
                                         //end of data
                                         if(clength==0)
                                         {
                                                 processBody();
                                                 done=true;
+                                                return;
                                         }
                                         //still more, but it hasnt been recieved yet
                                         if(ba <= j)
                                         {
                                                 status=1;
                                                 done=true;
                                                 break;
                                         }
                                         //still more data waiting
                                         else
                                         {
                                                 done=false;
                                                 //remove the chunk length header
                                                 tempQString.remove(0,j+1);
                                         }
                                         bRead=0;
         //                              break;
                                 //if there is more fall through to:
                                 //chunk length just read, still more in tempQstring
                                 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;
                                                 done=false;
         //                                      break;
                                         }
                                         //the chunk extends beyond the current data;
                                         else
                                         {
                                                 body+=tempQString;
-                                                bRead+=ba;
+                                                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;
                                                 done=false;
         //                                      break;
                                         }
                                         //the chunk extends beyond the current data;
                                         else
                                         {
                                                 body+=tempQString;
-                                                bRead+=ba;
+                                                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);
                         }
                 }
         }
         delete tempString;
 }
 
 void HttpComm::connectionClosed()
 {
         printf("HttpComm::connectionClosed: connection closed\n");
         processBody();
 }
 
 void HttpComm::parseHeader()
 {
         QStringList headerLines, tempList;
         int i;
 
         printf("HttpComm::parseHeader: start header\n\n");
         printf("%s", header.latin1());
         printf("HttpComm::parseHeader: end header\n");
 
         headerLines = QStringList::split('\n', header);
 
         for(i=0; i<headerLines.count(); i++)
         {
                 if(headerLines[i].startsWith("Content-Length:") )
                 {
                         tempList = QStringList::split(':', headerLines[i]);
                         tempList[1].stripWhiteSpace();
                         length = tempList[1].toUInt();
                 }
                 else if(headerLines[i].startsWith("Transfer-Encoding: chunked") )
                 {
                         printf("HttpComm::parseHeader: using chunked encoding\n");
                         chunked = true;
                         status=0;
                 }
         }
         
         printf("HttpConn::parseHeader: content-length: %d\n", length);
 }
 
 void HttpComm::processBody()
 {
+        printf("HttpComm::processBody: processing body\n");
         //printf("HttpComm::processBody: start body\n\n");
         //printf("%s", body.latin1());
         //printf("HttpComm::processBody: end body\n");
 
         int lastSlash = file.findRev('/');
         
         QString end = file;
-        end.truncate(lastSlash-1);
+        end.truncate(lastSlash+1);
         QString context("http://"+host+':'+portS+end);
+        printf("HttpComm::processBody: context: %s\n", context.latin1() );
 
         browser->setTextFormat(RichText);
+        browser->mimeSourceFactory()->setFilePath(context);
         browser->setText(body, context);
-        printf("%s\n", context.latin1() );
 }
diff --git a/noncore/net/ubrowser/moc_httpcomm.cpp b/noncore/net/ubrowser/moc_httpcomm.cpp
index ba2b939..5622531 100644
--- a/noncore/net/ubrowser/moc_httpcomm.cpp
+++ b/noncore/net/ubrowser/moc_httpcomm.cpp
@@ -1,52 +1,52 @@
 /****************************************************************************
 ** HttpComm meta object code from reading C++ file 'httpcomm.h'
 **
-** Created: Fri Jul 19 21:08:51 2002
+** Created: Thu Jul 25 10:24:04 2002
 **      by: The Qt MOC ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 
 #if !defined(Q_MOC_OUTPUT_REVISION)
 #define Q_MOC_OUTPUT_REVISION 9
 #elif Q_MOC_OUTPUT_REVISION != 9
 #error "Moc format conflict - please regenerate all moc files"
 #endif
 
 #include "httpcomm.h"
 #include <qmetaobject.h>
 #include <qapplication.h>
 
 
 
 const char *HttpComm::className() const
 {
     return "HttpComm";
 }
 
 QMetaObject *HttpComm::metaObj = 0;
 
 void HttpComm::initMetaObject()
 {
     if ( metaObj )
         return;
     if ( qstrcmp(QObject::className(), "QObject") != 0 )
         badSuperclassWarning("HttpComm","QObject");
     (void) staticMetaObject();
 }
 
 #ifndef QT_NO_TRANSLATION
 
 QString HttpComm::tr(const char* s)
 {
     return qApp->translate( "HttpComm", s, 0 );
 }
 
 QString HttpComm::tr(const char* s, const char * c)
 {
     return qApp->translate( "HttpComm", s, c );
 }
 
 #endif // QT_NO_TRANSLATION
 
 QMetaObject* HttpComm::staticMetaObject()
diff --git a/noncore/net/ubrowser/moc_mainview.cpp b/noncore/net/ubrowser/moc_mainview.cpp
index 9af282b..a188e12 100644
--- a/noncore/net/ubrowser/moc_mainview.cpp
+++ b/noncore/net/ubrowser/moc_mainview.cpp
@@ -1,52 +1,52 @@
 /****************************************************************************
 ** MainView meta object code from reading C++ file 'mainview.h'
 **
-** Created: Fri Jul 19 21:08:51 2002
+** Created: Thu Jul 25 10:24:03 2002
 **      by: The Qt MOC ($Id$)
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 
 #if !defined(Q_MOC_OUTPUT_REVISION)
 #define Q_MOC_OUTPUT_REVISION 9
 #elif Q_MOC_OUTPUT_REVISION != 9
 #error "Moc format conflict - please regenerate all moc files"
 #endif
 
 #include "mainview.h"
 #include <qmetaobject.h>
 #include <qapplication.h>
 
 
 
 const char *MainView::className() const
 {
     return "MainView";
 }
 
 QMetaObject *MainView::metaObj = 0;
 
 void MainView::initMetaObject()
 {
     if ( metaObj )
         return;
     if ( qstrcmp(QMainWindow::className(), "QMainWindow") != 0 )
         badSuperclassWarning("MainView","QMainWindow");
     (void) staticMetaObject();
 }
 
 #ifndef QT_NO_TRANSLATION
 
 QString MainView::tr(const char* s)
 {
     return qApp->translate( "MainView", s, 0 );
 }
 
 QString MainView::tr(const char* s, const char * c)
 {
     return qApp->translate( "MainView", s, c );
 }
 
 #endif // QT_NO_TRANSLATION
 
 QMetaObject* MainView::staticMetaObject()