From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:46
|
Update of /cvsroot/facturalux/lite/src/qt/src/network In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/src/network Modified Files: qdns.cpp qdns.h qftp.cpp qftp.h qhostaddress.cpp qhostaddress.h qhttp.cpp qhttp.h qnetwork.cpp qnetwork.h qserversocket.cpp qserversocket.h qsocket.cpp qsocket.h qsocketdevice.cpp qsocketdevice.h qsocketdevice_unix.cpp Log Message: Version 2.1 cerrada Index: qdns.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/network/qdns.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qdns.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qdns.cpp 21 Aug 2006 20:06:39 -0000 1.12 *************** *** 2560,2564 **** line = stream.readLine(); QStringList list = QStringList::split( " ", line ); ! if( list.isEmpty() ) continue; const QString type = list[0].lower(); --- 2560,2564 ---- line = stream.readLine(); QStringList list = QStringList::split( " ", line ); ! if ( line.startsWith( "#" ) || list.count() < 2 ) continue; const QString type = list[0].lower(); *************** *** 2566,2570 **** if ( type == "nameserver" ) { QHostAddress *address = new QHostAddress(); ! if ( address->setAddress( QString(line[1]) ) ) { // only add ipv6 addresses from resolv.conf if // this host supports ipv6. --- 2566,2570 ---- if ( type == "nameserver" ) { QHostAddress *address = new QHostAddress(); ! if ( address->setAddress( QString(list[1]) ) ) { // only add ipv6 addresses from resolv.conf if // this host supports ipv6. Index: qftp.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/network/qftp.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qftp.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qftp.cpp 21 Aug 2006 20:06:39 -0000 1.12 *************** *** 963,967 **** #ifndef QT_NO_TEXTCODEC if ( qt_ftp_filename_codec ) { ! int len; QCString enc = qt_ftp_filename_codec->fromUnicode(currentCmd,len); commandSocket.writeBlock( enc.data(), len ); --- 963,967 ---- #ifndef QT_NO_TEXTCODEC if ( qt_ftp_filename_codec ) { ! int len = 0; QCString enc = qt_ftp_filename_codec->fromUnicode(currentCmd,len); commandSocket.writeBlock( enc.data(), len ); Index: qhttp.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/network/qhttp.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qhttp.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qhttp.cpp 21 Aug 2006 20:06:39 -0000 1.12 *************** *** 2044,2047 **** --- 2044,2048 ---- // read data uint toRead = QMIN( (Q_LONG)n, d->chunkedSize ); + // uint toRead = QMIN( (Q_LONG)n, (d->chunkedSize < 0 ? (Q_LONG)n : d->chunkedSize) ); if ( !arr ) arr = new QByteArray( 0 ); Index: qsocket.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/network/qsocket.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qsocket.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qsocket.cpp 21 Aug 2006 20:06:39 -0000 1.12 *************** *** 281,284 **** --- 281,289 ---- to uses sockets in threads use the lower-level QSocketDevice class. + \warning Because Qt doesn't use the native socketstream + implementation on Mac OS X, QSocket has an implicit transfer + latency of 100ms. You can achieve lower latency on Mac OS X by + using QSocketDevice instead. + \sa QSocketDevice, QHostAddress, QSocketNotifier */ |