author | spiralman <spiralman> | 2003-03-15 16:19:51 (UTC) |
---|---|---|
committer | spiralman <spiralman> | 2003-03-15 16:19:51 (UTC) |
commit | d421f8708983df4bab1f9069e87cda94e1d4aeea (patch) (unidiff) | |
tree | 3aa7587f72705f73e65a5dc1aa3e824311fba2d1 /noncore/net/ubrowser/httpfactory.cpp | |
parent | 69823b154b29cd62c9d53f7ebdaae4cb7dd61939 (diff) | |
download | opie-d421f8708983df4bab1f9069e87cda94e1d4aeea.zip opie-d421f8708983df4bab1f9069e87cda94e1d4aeea.tar.gz opie-d421f8708983df4bab1f9069e87cda94e1d4aeea.tar.bz2 |
HttpFactory::data() now returns 0 if there is a 404 error (previously, if there was a 404 error on an image, the browser would get stuck in an infinite loop).
also, fixed html detection
Diffstat (limited to 'noncore/net/ubrowser/httpfactory.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/ubrowser/httpfactory.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp index 4ace4cb..b37e9f9 100644 --- a/noncore/net/ubrowser/httpfactory.cpp +++ b/noncore/net/ubrowser/httpfactory.cpp | |||
@@ -214,44 +214,50 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const | |||
214 | } | 214 | } |
215 | 215 | ||
216 | if( currentLine.contains( "Transfer-Encoding: chunked", false) >= 1 ) | 216 | if( currentLine.contains( "Transfer-Encoding: chunked", false) >= 1 ) |
217 | { | 217 | { |
218 | chunked = true; | 218 | chunked = true; |
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 ) ) | 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 ) | ||
247 | { | ||
248 | printf( "HttpFactory::processResponse: 404 error\n" ); | ||
249 | return 0; | ||
250 | } | ||
251 | |||
246 | currentLine = ""; | 252 | currentLine = ""; |
247 | printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() ); | 253 | printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() ); |
248 | } | 254 | } |
249 | } | 255 | } |
250 | } | 256 | } |
251 | 257 | ||
252 | const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const | 258 | const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const |
253 | { | 259 | { |
254 | printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" ); | 260 | printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" ); |
255 | 261 | ||
256 | QByteArray data( dataLen ); | 262 | QByteArray data( dataLen ); |
257 | QByteArray temp( dataLen ); | 263 | QByteArray temp( dataLen ); |