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

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
@@ -218,17 +218,17 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
                                 chunked = true;
                                 printf( "HttpFactory::processResponse: chunked encoding\n" );
                         }
                         
                         if( currentLine.contains( "Content-Type: text", false ) >= 1 )
                         {
                                 isText = true;
                                 printf( "HttpFactory::processResponse: content type text\n" );
-                                if( currentLine.contains( "html", false ) )
+                                if( currentLine.contains( "html", false ) >= 1)
                                 {
                                         browser->setTextFormat(Qt::RichText);
                                         printf( "HttpFactory::processResponse: content type html\n" );
                                 }
                         }
                         
                         if( currentLine.contains( "Content-Type: image", false ) >= 1 )
                         {
@@ -238,16 +238,22 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
                         
                         if( currentLine.contains( "Content-Length", false ) >= 1 )
                         {
                                 currentLine.remove( 0, 16 );
                                 dataLength = currentLine.toInt();
                                 printf( "HttpFactory::processResponse: content length: %d\n", dataLength );
                         }
                         
+                        if( currentLine.contains( "404", false ) >= 1 )
+                        {
+                                printf( "HttpFactory::processResponse: 404 error\n" );
+                                return 0;
+                        }
+                        
                         currentLine = "";
                         printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() );
                 }
         }
 }
 
 const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const
 {