| -rw-r--r-- | noncore/net/ubrowser/httpfactory.cpp | 5 | ||||
| -rw-r--r-- | noncore/net/ubrowser/httpfactory.h | 4 |
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 @@ -162,128 +162,133 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const image->setImage( QImage( data ) ); return image; } } const QMimeSource * HttpFactory::data(const QString &abs_or_rel_name, const QString & context) const { printf("HttpFactory::data: using relative data func\n"); if(abs_or_rel_name.startsWith(context)) { return data(abs_or_rel_name); } else { return data(context + abs_or_rel_name); } return 0; } const QByteArray HttpFactory::processResponse( int sockfd, bool &isText ) const { QByteArray inputBin( 1 ); QByteArray conClosedErr( 27 ); char conClosedErrMsg[] = "Connection to server closed"; QString currentLine; bool done=false, chunked=false; int dataLength = 0; for( int i = 0; i < 27; i++) { 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++ ) { data[i] = temp[i]; } dataLen -= recieved; while( dataLen > 0 ) { recieved = recv( sockfd, temp.data(), temp.size(), 0 ); dataLen -= recieved; // printf( "HttpFactory::recieveNormal: found some more data: %s\n", (char *)temp.data() ); for( int j = 0; j < recieved; j++ ) { data[i] = temp[j]; i++; } temp.fill('\0'); } printf( "HttpFactory::recieveNormal: end of data\n" ); return data; } const QByteArray HttpFactory::recieveChunked( int sockfd ) const { printf( "HttpFactory::recieveChunked: recieving data with chunked encoding\n" ); QByteArray data; QByteArray temp( 1 ); int recieved, i = 0, cSize = 0; QString cSizeS; printf( "HttpFactory::recieveChunked: temp.size(): %d\n", temp.size() ); recv( sockfd, temp.data(), temp.size(), 0 ); 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; }; |