summaryrefslogtreecommitdiff
authorspiralman <spiralman>2002-07-25 16:38:22 (UTC)
committer spiralman <spiralman>2002-07-25 16:38:22 (UTC)
commit11170a8b8c1a2755cb7d9416ea99fc5067d0c53d (patch) (side-by-side diff)
tree0e2ea513139dfd146e8fe8f96f8fb791d2382e17
parent8895e9bd55244f32f12ff619e020a23afac44808 (diff)
downloadopie-11170a8b8c1a2755cb7d9416ea99fc5067d0c53d.zip
opie-11170a8b8c1a2755cb7d9416ea99fc5067d0c53d.tar.gz
opie-11170a8b8c1a2755cb7d9416ea99fc5067d0c53d.tar.bz2
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...
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/ubrowser/httpcomm.cpp11
-rw-r--r--noncore/net/ubrowser/moc_httpcomm.cpp2
-rw-r--r--noncore/net/ubrowser/moc_mainview.cpp2
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
@@ -155,6 +155,7 @@ void HttpComm::incoming()
{
processBody();
done=true;
+ return;
}
//still more, but it hasnt been recieved yet
if(ba <= j)
@@ -194,7 +195,7 @@ void HttpComm::incoming()
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");
@@ -224,7 +225,7 @@ void HttpComm::incoming()
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");
@@ -279,6 +280,7 @@ void HttpComm::parseHeader()
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");
@@ -286,10 +288,11 @@ void HttpComm::processBody()
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,7 +1,7 @@
/****************************************************************************
** 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!
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,7 +1,7 @@
/****************************************************************************
** 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!