added code to force QTextBrowser to parse input as html if http header claims thats what it is (it was having problems autodetecting on certain pages)

2 files changed, 7 insertions, 2 deletions

diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp
index 0586e96..4ace4cb 100644
--- a/noncore/net/ubrowser/httpfactory.cpp
+++ b/noncore/net/ubrowser/httpfactory.cpp
@@ -214,24 +214,29 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
                         }
                         
                         if( currentLine.contains( "Transfer-Encoding: chunked", false) >= 1 )
                         {
                                 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 ) )
+                                {
+                                        browser->setTextFormat(Qt::RichText);
+                                        printf( "HttpFactory::processResponse: content type html\n" );
+                                }
                         }
                         
                         if( currentLine.contains( "Content-Type: image", false ) >= 1 )
                         {
                                 isText = false;
                                 printf( "HttpFactory::processResponse: content type image\n" );
                         }
                         
                         if( currentLine.contains( "Content-Length", false ) >= 1 )
                         {
                                 currentLine.remove( 0, 16 );
                                 dataLength = currentLine.toInt();
diff --git a/noncore/net/ubrowser/httpfactory.h b/noncore/net/ubrowser/httpfactory.h
index 214120c..ec59ebb 100644
--- a/noncore/net/ubrowser/httpfactory.h
+++ b/noncore/net/ubrowser/httpfactory.h
@@ -21,31 +21,31 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 
 #include <stdio.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 
-#include "httpcomm.h"
+//#include "httpcomm.h"
 
 class HttpFactory : public QMimeSourceFactory
 {
 public:
         HttpFactory(QTextBrowser *newBrowser);
         const QMimeSource * data(const QString &abs_name) const;
         const QMimeSource * data(const QString &abs_or_rel_name, const QString & context) const;
 private:
         //QSocket *socket;
-        HttpComm *comm;
+        //HttpComm *comm;
         QTextDrag *text;
         QImageDrag *image;
         QTextBrowser *browser;
         
         const QByteArray processResponse( int sockfd, bool &isText) const;
         const QByteArray recieveNormal( int sockfd, int dataLen ) const;
         const QByteArray recieveChunked( int sockfd ) const;
 };