author | spiralman <spiralman> | 2002-07-22 22:37:22 (UTC) |
---|---|---|
committer | spiralman <spiralman> | 2002-07-22 22:37:22 (UTC) |
commit | c19b6cccd243107eb774c5e0bdb269265f3b5abe (patch) (unidiff) | |
tree | 9c888fb5a6a09d102df3143b9458465c11e7380a /noncore/net/ubrowser | |
parent | 0433711d6f7190073c476a2f771dfce879ef87e5 (diff) | |
download | opie-c19b6cccd243107eb774c5e0bdb269265f3b5abe.zip opie-c19b6cccd243107eb774c5e0bdb269265f3b5abe.tar.gz opie-c19b6cccd243107eb774c5e0bdb269265f3b5abe.tar.bz2 |
fixed some bugs with chunked transfer encoding, still doesnt work though
-rw-r--r-- | noncore/net/ubrowser/Makefile | 20 | ||||
-rw-r--r-- | noncore/net/ubrowser/Makefile.in | 18 | ||||
-rw-r--r-- | noncore/net/ubrowser/httpcomm.cpp | 49 |
3 files changed, 63 insertions, 24 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 @@ | |||
1 | ############################################################################# | 1 | ############################################################################# |
2 | # Automatically generated from noncore/ubrowser/Makefile.in | 2 | # Automatically generated from noncore/net/ubrowser/Makefile.in |
3 | # Build options from | 3 | # Build options from |
@@ -107,3 +107,3 @@ CC = $(SYSCONF_CC) $(QT_C_MT) | |||
107 | CFLAGS =$(SYSCONF_CFLAGS) | 107 | CFLAGS =$(SYSCONF_CFLAGS) |
108 | INCPATH =-I$(OPIEDIR)/include | 108 | INCPATH =-I../../../include |
109 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 109 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
@@ -115,3 +115,3 @@ UIC = $(SYSCONF_UIC) | |||
115 | 115 | ||
116 | DESTDIR = $(OPIEDIR)/bin/ | 116 | DESTDIR = ../../../bin/ |
117 | VER_MAJ = 1 | 117 | VER_MAJ = 1 |
@@ -208,6 +208,6 @@ REQUIRES= | |||
208 | main.o: main.cpp \ | 208 | main.o: main.cpp \ |
209 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 209 | ../../../include/qpe/qpeapplication.h \ |
210 | mainview.h \ | 210 | mainview.h \ |
211 | $(OPIEDIR)/include/qpe/resource.h \ | 211 | ../../../include/qpe/resource.h \ |
212 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 212 | ../../../include/qpe/qpetoolbar.h \ |
213 | httpfactory.h \ | 213 | httpfactory.h \ |
@@ -217,4 +217,4 @@ mainview.o: mainview.cpp \ | |||
217 | mainview.h \ | 217 | mainview.h \ |
218 | $(OPIEDIR)/include/qpe/resource.h \ | 218 | ../../../include/qpe/resource.h \ |
219 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 219 | ../../../include/qpe/qpetoolbar.h \ |
220 | httpfactory.h \ | 220 | httpfactory.h \ |
@@ -231,4 +231,4 @@ moc_mainview.o: moc_mainview.cpp \ | |||
231 | mainview.h \ | 231 | mainview.h \ |
232 | $(OPIEDIR)/include/qpe/resource.h \ | 232 | ../../../include/qpe/resource.h \ |
233 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 233 | ../../../include/qpe/qpetoolbar.h \ |
234 | httpfactory.h \ | 234 | 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) | |||
8 | CFLAGS =$(SYSCONF_CFLAGS) | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(OPIEDIR)/include | 9 | INCPATH =-I../../../include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
@@ -16,3 +16,3 @@ UIC = $(SYSCONF_UIC) | |||
16 | 16 | ||
17 | DESTDIR = $(OPIEDIR)/bin/ | 17 | DESTDIR = ../../../bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
@@ -109,6 +109,6 @@ REQUIRES= | |||
109 | main.o: main.cpp \ | 109 | main.o: main.cpp \ |
110 | $(OPIEDIR)/include/qpe/qpeapplication.h \ | 110 | ../../../include/qpe/qpeapplication.h \ |
111 | mainview.h \ | 111 | mainview.h \ |
112 | $(OPIEDIR)/include/qpe/resource.h \ | 112 | ../../../include/qpe/resource.h \ |
113 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 113 | ../../../include/qpe/qpetoolbar.h \ |
114 | httpfactory.h \ | 114 | httpfactory.h \ |
@@ -118,4 +118,4 @@ mainview.o: mainview.cpp \ | |||
118 | mainview.h \ | 118 | mainview.h \ |
119 | $(OPIEDIR)/include/qpe/resource.h \ | 119 | ../../../include/qpe/resource.h \ |
120 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 120 | ../../../include/qpe/qpetoolbar.h \ |
121 | httpfactory.h \ | 121 | httpfactory.h \ |
@@ -132,4 +132,4 @@ moc_mainview.o: moc_mainview.cpp \ | |||
132 | mainview.h \ | 132 | mainview.h \ |
133 | $(OPIEDIR)/include/qpe/resource.h \ | 133 | ../../../include/qpe/resource.h \ |
134 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ | 134 | ../../../include/qpe/qpetoolbar.h \ |
135 | httpfactory.h \ | 135 | 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() | |||
138 | { | 138 | { |
139 | tempQString.remove(0, j); | 139 | tempQString.remove(0, j+1); |
140 | printf("HttpComm::incoming: removing http header. Result: \n%s", tempQString.latin1()); | ||
140 | } | 141 | } |
@@ -151,2 +152,3 @@ void HttpComm::incoming() | |||
151 | printf("HttpComm::Incoming: chunk length: %d\n", clength); | 152 | printf("HttpComm::Incoming: chunk length: %d\n", clength); |
153 | //end of data | ||
152 | if(clength==0) | 154 | if(clength==0) |
@@ -156,2 +158,3 @@ void HttpComm::incoming() | |||
156 | } | 158 | } |
159 | //still more, but it hasnt been recieved yet | ||
157 | if(ba <= j) | 160 | if(ba <= j) |
@@ -160,4 +163,5 @@ void HttpComm::incoming() | |||
160 | done=true; | 163 | done=true; |
161 | // break; | 164 | break; |
162 | } | 165 | } |
166 | //still more data waiting | ||
163 | else | 167 | else |
@@ -165,5 +169,7 @@ void HttpComm::incoming() | |||
165 | done=false; | 169 | done=false; |
170 | //remove the chunk length header | ||
171 | tempQString.remove(0,j+1); | ||
166 | } | 172 | } |
167 | bRead=0; | 173 | bRead=0; |
168 | break; | 174 | // break; |
169 | //if there is more fall through to: | 175 | //if there is more fall through to: |
@@ -176,2 +182,3 @@ void HttpComm::incoming() | |||
176 | newTQstring.truncate(clength-bRead); | 182 | newTQstring.truncate(clength-bRead); |
183 | bRead+=newTQstring.length(); | ||
177 | body+=newTQstring; | 184 | body+=newTQstring; |
@@ -183,3 +190,3 @@ void HttpComm::incoming() | |||
183 | done=false; | 190 | done=false; |
184 | break; | 191 | // break; |
185 | } | 192 | } |
@@ -194,3 +201,34 @@ void HttpComm::incoming() | |||
194 | done=true; | 201 | done=true; |
195 | break; | 202 | status=2; |
203 | // break; | ||
204 | } | ||
205 | break; | ||
206 | //just got data in, continue reading chunk | ||
207 | case 2: | ||
208 | //the current data extends beyond the end of the chunk | ||
209 | if(bRead + tempQString.length() > clength) | ||
210 | { | ||
211 | QString newTQstring = tempQString; | ||
212 | newTQstring.truncate(clength-bRead); | ||
213 | bRead+=newTQstring.length(); | ||
214 | body+=newTQstring; | ||
215 | printf("HttpComm::incoming: start new body piece 3: \n"); | ||
216 | printf("%s", newTQstring.latin1() ); | ||
217 | printf("HttpComm::incoming: end new body piece 3.\n"); | ||
218 | status=0; | ||
219 | j=clength-bRead; | ||
220 | done=false; | ||
221 | // break; | ||
222 | } | ||
223 | //the chunk extends beyond the current data; | ||
224 | else | ||
225 | { | ||
226 | body+=tempQString; | ||
227 | bRead+=ba; | ||
228 | printf("HttpComm::incoming: start new body piece 4: \n"); | ||
229 | printf("%s", tempQString.latin1() ); | ||
230 | printf("HttpComm::incoming: end new body piece 4.\n"); | ||
231 | done=true; | ||
232 | status=2; | ||
233 | // break; | ||
196 | } | 234 | } |
@@ -198,2 +236,3 @@ void HttpComm::incoming() | |||
198 | } | 236 | } |
237 | printf("HttpComm::incoming: chunked encoding: bRead: %d\n", bRead); | ||
199 | } | 238 | } |