| -rw-r--r-- | noncore/net/ubrowser/httpcomm.cpp | 11 | ||||
| -rw-r--r-- | noncore/net/ubrowser/moc_httpcomm.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/ubrowser/moc_mainview.cpp | 2 |
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 @@ -150,16 +150,17 @@ void HttpComm::incoming() 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; } @@ -189,17 +190,17 @@ void HttpComm::incoming() 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; @@ -219,17 +220,17 @@ void HttpComm::incoming() 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; @@ -274,22 +275,24 @@ void HttpComm::parseHeader() } } 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,12 +1,12 @@ /**************************************************************************** ** 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 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,12 +1,12 @@ /**************************************************************************** ** 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 |