| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/network/access/qhttpnetworkconnection_p.h
tests/auto/qstyle/qstyle.pro
tests/auto/qstyle/tst_qstyle.cpp
tools/configure/configureapp.cpp
configure.exe will be recompiled in next commit. Took ours.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Looks like this `&&' was meant to be `||'.
QNetworkProxy::FtpCachingProxy is 5 so it's clearly impossible for type
to be less than 0 and greater than QNetworkProxy::FtpCachingProxy.
Reviewed-by: Aaron Kennedy
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
| |
| |
| |
| |
| |
| | |
A few "fixes" to make that number go down..
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| | |
This saves memory and prevents warnings from RVCT.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a bug that occured together with a QProgressDialog.
The signal emission was like:
readyRead readyRead readyRead [...] readyRead finished readyRead
Now finished should be properly at the ending of this sequence.
Task-number: 256630
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| | |
Reviewed-by: Volker Hilsheimer
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This makes sure the keep-alive connections stay open even
if someone deletes a QNetworkReply which will then go all the
way down to removeReply(QHttpNetworkReply).
Should fix
http://lists.trolltech.com/pipermail/qt-interest/2009-June/007777.html
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Because less-than instead of less-or-equal-than was used, the last
line of a PEM encoding was not built when the raw length was multiple
of 64.
Task-number: 256066
Reviewed-by: mariusSO
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
(-beta2, but 1.0.0 final shouldn't be very different)
Merge-request: 449
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.
Rev-By: Harald Fernengel
Rev-By: Ralf Engels
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| |
| |
| |
| |
| |
| |
| | |
This was a contribution sent via the public bugs channel.
Task-number: 255161
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| |
| |
| | |
otherwise PeekNamedPipe() may block in threaded environments.
Reviewed-by: thiago
|
|\ \ |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
...but just silently return. This is ok because at another location
in QNetworkReplyImplPrivate we do the same.
Reviewed-by: Thiago
Task-number: 254638
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 254365
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
to the socket connection. (Reviewed - see below.)
Also included corrections to the description of how to send SocketError
and SocketState values via signals. (Trust me - as part of an earlier
revision of the custom types documentation.)
Task-number: 222907
Reviewed-by: Andy Shaw
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Correct ordinal for BIO_free symbol is 209.
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The commit enables -openssl config in addition to -openssl-linked
in Symbian OS platforms. In Symbian OS the symbol names are stripped
away from DLLand symbols are are referenced via ordinal numbers.
This change resolves the correct ordinals for SSL symbols in Symbian OS.
The change is a bit hackish, but is currently only way to resolve
symbols at runtime in Symbian OS - if STDDLL targettype is not counted.
The problem of STDDLL target type is that it is not supported by S60 3.1
and in addition the SSL libraries in S60 are not currently build with
STDDLL target but DLL target.
This mechanism should work as long as BC for SSL symbols is kept.
And S60 has given binary promise, so we should not have problems...
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
compilation breakage introduced in 6c1d7e57.
The fix in fc7a43cce did fix the failure, but created another one
because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6
Reviewed-by: Jason McDonald
|
| |
| |
| |
| |
| |
| |
| | |
On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were
missing. So #include winsock2.h and also use our own structures.
Reviewed-By: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: 254333
Reviewed-by: Andy Shaw <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This case it was possible to fix by using a union of the types when we
actually declare the variable.
Besides, this avoids a bunch of #ifdef for IPv6 functionality.
Reviewed-By: Oswald Buddenhagen
|
| |
| |
| |
| |
| | |
This definitely has to be reviewed and changed, especially when generic
problem with socket notifier and sync operations on sockets is solved.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
tests/auto/qiodevice/tst_qiodevice.cpp
tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When expiring cache files use a QMultiMap, when using a QMap not all
files are put into the map because often many files (downloaded or
updated at the same time) will have the same creation QDateTime and
so only one will go into the QMap who's key is QDateTime.
Reviewed-By: Thiago Macieira
Reviewed-By: Peter Hartmann
|
| |
| |
| |
| | |
and map them to read / write notifications.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| |
| |
| |
| |
| |
| |
| | |
return error upon receiving an unknown authentication method (e.g.
WSSE); before we were just silently returning.
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| | |
responses to POST might be cacheable, but are not cacheable by default;
responses to PUT or DELETE are never cacheable.
Reviewed-by: Thiago Macieira
Task-number: 252281
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There's no need for using QByteArrayMatcher for one single character,
so avoid the overhead.
Also validate the message header a bit more: we require the status
line to start with "HTTP/n.m " where n and m are positive integers
less than 10.
Task-number: 248838
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
proper HTTP reply.
If the server's reply doesn't start with "HTTP/", then the reply is
not valid. This could happen if we connected via HTTP to an HTTPS
server. It could also happen with an Icecast server (reply ICY/x.y).
Task-number: 248838
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| | |
Task-number: 236925
Reviewed-by: Tor Arne Vestbø
|
| | |
|
| |
| |
| |
| | |
functions.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
original patch by Benjamin Meyer.
Handle multiple cookies split by new lines in a cleaner way.
Parsing the combined string was error prone. Splitting them and
sending each line through our header parser is more robust, and has
more obvious code paths.
Tested by logging into wordpress.com, facebook.com etc.
Reviewed-by: Thiago
Task-number: 251959
|