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
@@ -194,64 +194,69 @@ const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const
 		conClosedErr[i] = conClosedErrMsg[i];
 	}
 	
 	while( !done )
 	{
 		recv( sockfd, inputBin.data(), inputBin.size(), 0 );
 		currentLine += *(inputBin.data());
 		
 		if( *(inputBin.data()) == '\n' )
 		{
 			if( currentLine.isEmpty() || currentLine.startsWith( "\r") )
 			{
 				printf( "HttpFactory::processResponse: end of header\n" );
 				if( chunked )
 				{
 					return recieveChunked( sockfd );
 				} else {
 					return recieveNormal( sockfd, dataLength );
 				}
 				done = true;
 			}
 			
 			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();
 				printf( "HttpFactory::processResponse: content length: %d\n", dataLength );
 			}
 			
 			currentLine = "";
 			printf("HttpFactory::processResponse: reseting currentLine: %s\n", currentLine.latin1() );
 		}
 	}
 }
 
 const QByteArray HttpFactory::recieveNormal( int sockfd, int dataLen ) const
 {
 	printf( "HttpFactory::recieveNormal: recieving w/out chunked encoding\n" );
 	
 	QByteArray data( dataLen );
 	QByteArray temp( dataLen );
 	int recieved, i;
 	
 	recieved = recv( sockfd, temp.data(), temp.size(), 0 );
 	printf( "HttpFactory::recieveNormal: found some data: %s\n", (char *)temp.data() );
 	for( i = 0; i < recieved; i++ )
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
@@ -1,51 +1,51 @@
 /*
 Opie-uBrowser.  a very small web browser, using on QTextBrowser for html display/parsing
 Copyright (C) 2002 Thomas Stephens
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include <qmime.h>
 //#include <qsocket.h>
 #include <qstring.h>
 #include <qdragobject.h>
 #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;
 };