-rw-r--r-- | noncore/net/ubrowser/httpfactory.cpp | 8 | ||||
-rw-r--r-- | noncore/net/ubrowser/opie-ubrowser.control | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp index b37e9f9..154d5d0 100644 --- a/noncore/net/ubrowser/httpfactory.cpp +++ b/noncore/net/ubrowser/httpfactory.cpp | |||
@@ -219,158 +219,158 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const | |||
219 | printf( "HttpFactory::processResponse: chunked encoding\n" ); | 219 | printf( "HttpFactory::processResponse: chunked encoding\n" ); |
220 | } | 220 | } |
221 | 221 | ||
222 | if( currentLine.contains( "Content-Type: text", false ) >= 1 ) | 222 | if( currentLine.contains( "Content-Type: text", false ) >= 1 ) |
223 | { | 223 | { |
224 | isText = true; | 224 | isText = true; |
225 | printf( "HttpFactory::processResponse: content type text\n" ); | 225 | printf( "HttpFactory::processResponse: content type text\n" ); |
226 | if( currentLine.contains( "html", false ) >= 1) | 226 | if( currentLine.contains( "html", false ) >= 1) |
227 | { | 227 | { |
228 | browser->setTextFormat(Qt::RichText); | 228 | browser->setTextFormat(Qt::RichText); |
229 | printf( "HttpFactory::processResponse: content type html\n" ); | 229 | printf( "HttpFactory::processResponse: content type html\n" ); |
230 | } | 230 | } |
231 | } | 231 | } |
232 | 232 | ||
233 | if( currentLine.contains( "Content-Type: image", false ) >= 1 ) | 233 | if( currentLine.contains( "Content-Type: image", false ) >= 1 ) |
234 | { | 234 | { |
235 | isText = false; | 235 | isText = false; |
236 | printf( "HttpFactory::processResponse: content type image\n" ); | 236 | printf( "HttpFactory::processResponse: content type image\n" ); |
237 | } | 237 | } |
238 | 238 | ||
239 | if( currentLine.contains( "Content-Length", false ) >= 1 ) | 239 | if( currentLine.contains( "Content-Length", false ) >= 1 ) |
240 | { | 240 | { |
241 | currentLine.remove( 0, 16 ); | 241 | currentLine.remove( 0, 16 ); |
242 | dataLength = currentLine.toInt(); | 242 | dataLength = currentLine.toInt(); |
243 | printf( "HttpFactory::processResponse: content length: %d\n", dataLength ); | 243 | printf( "HttpFactory::processResponse: content length: %d\n", dataLength ); |
244 | } | 244 | } |
245 | 245 | ||
246 | if( currentLine.contains( "404", false ) >= 1 ) | 246 | if( currentLine.contains( "404", false ) >= 1 ) |
247 | { | 247 | { |
248 | printf( "HttpFactory::processResponse: 404 error\n" ); | 248 | printf( "HttpFactory::processResponse: 404 error\n" ); |
249 | return 0; | 249 | return 0; |
250 | } | 250 | } |
251 | 251 | ||
252 | currentLine = ""; | 252 | currentLine = ""; |
253 | printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() ); | 253 | printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() ); |
254 | } | 254 | } |
255 | } | 255 | } |
256 | } | 256 | } |
257 | 257 | ||
258 | const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const | 258 | const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const |
259 | { | 259 | { |
260 | printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" ); | 260 | printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" ); |
261 | 261 | ||
262 | QByteArray data( dataLen ); | 262 | QByteArray data( dataLen ); |
263 | QByteArray temp( dataLen ); | 263 | QByteArray temp( dataLen ); |
264 | int recieved, i; | 264 | int recieved, i; |
265 | 265 | ||
266 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); | 266 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); |
267 | printf( "HttpFactory::recieveNormal: found some data: %s\n", (char *)temp.data() ); | 267 | //printf( "HttpFactory::recieveNormal: found some data: %s\n", (char *)temp.data() ); |
268 | for( i = 0; i < recieved; i++ ) | 268 | for( i = 0; i < recieved; i++ ) |
269 | { | 269 | { |
270 | data[i] = temp[i]; | 270 | data[i] = temp[i]; |
271 | } | 271 | } |
272 | dataLen -= recieved; | 272 | dataLen -= recieved; |
273 | while( dataLen > 0 ) | 273 | while( dataLen > 0 ) |
274 | { | 274 | { |
275 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); | 275 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); |
276 | dataLen -= recieved; | 276 | dataLen -= recieved; |
277 | // printf( "HttpFactory::recieveNormal: found some more data: %s\n", (char *)temp.data() ); | 277 | // printf( "HttpFactory::recieveNormal: found some more data: %s\n", (char *)temp.data() ); |
278 | for( int j = 0; j < recieved; j++ ) | 278 | for( int j = 0; j < recieved; j++ ) |
279 | { | 279 | { |
280 | data[i] = temp[j]; | 280 | data[i] = temp[j]; |
281 | i++; | 281 | i++; |
282 | } | 282 | } |
283 | temp.fill('\0'); | 283 | temp.fill('\0'); |
284 | } | 284 | } |
285 | 285 | ||
286 | printf( "HttpFactory::recieveNormal: end of data\n" ); | 286 | printf( "HttpFactory::recieveNormal: end of data\n" ); |
287 | return data; | 287 | return data; |
288 | } | 288 | } |
289 | 289 | ||
290 | const QByteArray HttpFactory::recieveChunked( int sockfd ) const | 290 | const QByteArray HttpFactory::recieveChunked( int sockfd ) const |
291 | { | 291 | { |
292 | printf( "HttpFactory::recieveChunked: recieving data with chunked encoding\n" ); | 292 | printf( "HttpFactory::recieveChunked: recieving data with chunked encoding\n" ); |
293 | 293 | ||
294 | QByteArray data; | 294 | QByteArray data; |
295 | QByteArray temp( 1 ); | 295 | QByteArray temp( 1 ); |
296 | int recieved, i = 0, cSize = 0; | 296 | int recieved, i = 0, cSize = 0; |
297 | QString cSizeS; | 297 | QString cSizeS; |
298 | 298 | ||
299 | printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); | 299 | //printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); |
300 | recv( sockfd, temp.data(), temp.size(), 0 ); | 300 | recv( sockfd, temp.data(), temp.size(), 0 ); |
301 | while( *(temp.data()) != '\n' && *(temp.data()) != ';' ) | 301 | while( *(temp.data()) != '\n' && *(temp.data()) != ';' ) |
302 | { | 302 | { |
303 | // printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); | 303 | // printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); |
304 | // printf( "HttpFactory::recieveChunked: temp.data(): %c\n", temp[0] ); | 304 | // printf( "HttpFactory::recieveChunked: temp.data(): %c\n", temp[0] ); |
305 | cSizeS += temp[0]; | 305 | cSizeS += temp[0]; |
306 | recv( sockfd, temp.data(), temp.size(), 0 ); | 306 | recv( sockfd, temp.data(), temp.size(), 0 ); |
307 | } | 307 | } |
308 | 308 | ||
309 | printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() ); | 309 | printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() ); |
310 | cSize = cSizeS.toInt( 0, 16 ); | 310 | cSize = cSizeS.toInt( 0, 16 ); |
311 | printf( "HttpFactory::recieveChunked: first chunk of size: %d\n", cSize ); | 311 | printf( "HttpFactory::recieveChunked: first chunk of size: %d\n", cSize ); |
312 | 312 | ||
313 | if( *(temp.data()) == ';' ) | 313 | if( *(temp.data()) == ';' ) |
314 | { | 314 | { |
315 | while( *(temp.data()) != '\n' ) | 315 | while( *(temp.data()) != '\n' ) |
316 | { | 316 | { |
317 | recv( sockfd, temp.data(), temp.size(), 0 ); | 317 | recv( sockfd, temp.data(), temp.size(), 0 ); |
318 | } | 318 | } |
319 | } | 319 | } |
320 | 320 | ||
321 | temp.fill( '\0', cSize ); | 321 | temp.fill( '\0', cSize ); |
322 | data.fill( '\0', cSize ); | 322 | data.fill( '\0', cSize ); |
323 | 323 | ||
324 | while( cSize > 0 ) | 324 | while( cSize > 0 ) |
325 | { | 325 | { |
326 | while( cSize > 0 ) | 326 | while( cSize > 0 ) |
327 | { | 327 | { |
328 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); | 328 | recieved = recv( sockfd, temp.data(), temp.size(), 0 ); |
329 | cSize -= recieved; | 329 | cSize -= recieved; |
330 | for( int j = 0; j < recieved; j++ ) | 330 | for( int j = 0; j < recieved; j++ ) |
331 | { | 331 | { |
332 | data[i] = temp[j]; | 332 | data[i] = temp[j]; |
333 | i++; | 333 | i++; |
334 | } | 334 | } |
335 | temp.fill('\0', cSize); | 335 | temp.fill('\0', cSize); |
336 | } | 336 | } |
337 | 337 | ||
338 | printf( "HttpFactory::recieveChunked: current data:\n%s", data.data() ); | 338 | // printf( "HttpFactory::recieveChunked: current data:\n%s", data.data() ); |
339 | 339 | ||
340 | temp.fill('\0', 1); | 340 | temp.fill('\0', 1); |
341 | cSizeS = ""; | 341 | cSizeS = ""; |
342 | cSize = 0; | 342 | cSize = 0; |
343 | 343 | ||
344 | recv( sockfd, temp.data(), temp.size(), 0 ); | 344 | recv( sockfd, temp.data(), temp.size(), 0 ); |
345 | if( *(temp.data()) == '\r' ) | 345 | if( *(temp.data()) == '\r' ) |
346 | { | 346 | { |
347 | recv( sockfd, temp.data(), temp.size(), 0 ); | 347 | recv( sockfd, temp.data(), temp.size(), 0 ); |
348 | } | 348 | } |
349 | recv( sockfd, temp.data(), temp.size(), 0 ); | 349 | recv( sockfd, temp.data(), temp.size(), 0 ); |
350 | while( *(temp.data()) != '\n' && *(temp.data()) != ';' ) | 350 | while( *(temp.data()) != '\n' && *(temp.data()) != ';' ) |
351 | { | 351 | { |
352 | // printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); | 352 | // printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); |
353 | printf( "HttpFactory::recieveChunked: temp.data(): %d\n", temp[0] ); | 353 | // printf( "HttpFactory::recieveChunked: temp.data(): %d\n", temp[0] ); |
354 | cSizeS += temp[0]; | 354 | cSizeS += temp[0]; |
355 | recv( sockfd, temp.data(), temp.size(), 0 ); | 355 | recv( sockfd, temp.data(), temp.size(), 0 ); |
356 | } | 356 | } |
357 | 357 | ||
358 | printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() ); | 358 | printf( "HttpFactory::recieveChunked: cSizeS: %s\n", cSizeS.latin1() ); |
359 | cSize = cSizeS.toInt( 0, 16 ); | 359 | cSize = cSizeS.toInt( 0, 16 ); |
360 | printf( "HttpFactory::recieveChunked: next chunk of size: %d\n", cSize ); | 360 | printf( "HttpFactory::recieveChunked: next chunk of size: %d\n", cSize ); |
361 | 361 | ||
362 | if( *(temp.data()) == ';' ) | 362 | if( *(temp.data()) == ';' ) |
363 | { | 363 | { |
364 | while( *(temp.data()) != '\n' ) | 364 | while( *(temp.data()) != '\n' ) |
365 | { | 365 | { |
366 | recv( sockfd, temp.data(), temp.size(), 0 ); | 366 | recv( sockfd, temp.data(), temp.size(), 0 ); |
367 | } | 367 | } |
368 | } | 368 | } |
369 | 369 | ||
370 | temp.fill( '\0', cSize ); | 370 | temp.fill( '\0', cSize ); |
371 | data.resize( data.size() + cSize ); | 371 | data.resize( data.size() + cSize ); |
372 | } | 372 | } |
373 | 373 | ||
374 | printf( "HttpFactory::recieveChunked: end of data\n" ); | 374 | printf( "HttpFactory::recieveChunked: end of data\n" ); |
375 | return data; | 375 | return data; |
376 | } | 376 | } |
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control index b60098b..17c716e 100644 --- a/noncore/net/ubrowser/opie-ubrowser.control +++ b/noncore/net/ubrowser/opie-ubrowser.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png | 1 | Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/applications | 3 | Section: opie/applications |
4 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 4 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: 0.0-$SUB_VERSION | 6 | Version: 0.1-$SUB_VERSION |
7 | Depends: opie-base | 7 | Depends: opie-base |
8 | License: GPL | 8 | License: GPL |
9 | Description: a very small web browser | 9 | Description: a very small web browser |