| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: QTBUG-13055
Reviewed-by: Markus Goetz
|
|
|
|
|
| |
Task-number: QTBUG-13593
Reviewed-by: Richard Moe Gustavsen
|
|
|
|
|
| |
Task-number: QTBUG-13055
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
|
|
|
| |
Connect a new channel only when there is no one currently available.
Only pair the request with the channel once we know if it got connected
or not. This leads to faster sending on requests as we reuse already
connected channels that became free in the meanwhile.
Task-number: QTBUG-17084
Reviewed-by: Markus Goetz
Reviewed-by: Peter Hartmann
|
|
|
|
|
| |
Task-number: QTBUG-14807
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
|
| |
SNI = Server Name Indication. The function "SSL_ctrl()" has been there
since always in OpenSSL, but not with the specific enum
SSL_CTRL_SET_TLSEXT_HOSTNAME, so let's avoid the call for older
versions.
Additionally, fix the resolving of SSL_CTX_load_verify_locations for
Symbian (is not used in Symbian yet).
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
| |
Introduced a ClosingState for the channel to better track the state
of the socket.
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
| |
The data returned by constData() will not be null-terminated if the QByteArray
was created from an existing raw data with QByteArray::fromRawData().
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
|
| |
Instead of relying on the old behavior of the deprecated QString(QByteArray)
constructor which stops copying the byte array at the null termination
character if there is one embedded in the array, we copy the whole provided
QByteArray object into the QString when QStringBuilder is used.
Reviewed-by: Harald Fernengel
|
|
|
|
|
|
|
|
| |
When QSplashScreen waits for the window to be fully shown, we shouldn't
re-enter the event loop by processing posted events.
Reviewed-by: axis
Reviewed-by: Olivier Goffart
|
|
|
|
|
|
|
|
|
|
| |
QString() is a no-op if string is already a QString
And it fixes the compilation if other types are use that do not have
toLocal8Bit such as QStringBuilder.
WebKit trunk has an instance of such usage.
Reviewed-by: Joao
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When reading large files that are greater in size than the
TEXTSTREAM_BUFFERSIZE buffer, calling pos() caused erroneous buffer
positioning. The cause of this was QTextStreamPrivate::readBufferOffset
value being updated, but QTextStreamPrivate::readConverterSavedStateOffset
was not. Usually, if pos() is called, it is called multiple times. Since
QTextStreamPrivate::readConverterSavedStateOffset was never reset,
QTextStreamPrivate::readBufferOffset would accumulate the wrong position
and QTextStreamPrivate::consume() will 'discard' the wrong number of
bytes from the buffer.
Task-number: QTBUG-9814
Merge-request: 2569
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|
|
|
|
|
|
| |
... by defining it ourselves. That symbol is missing in the header files
for Symbian.
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
|
|
| |
TLS is backward compatible, so servers only supporting SSL 3 should
still work. All browsers send a TLS 1.0 Client Hello these days.
However, some servers apparently have problems with a TLS handshake
(and a SNI message); for now, wait and see how many of them are
broken and either add a fallback to SSLv3 or blacklist them (i.e.
set the used SSL version for those servers explicitly).
Reviewed-by: Markus Goetz
|
|
|
|
| |
Task-number: QTBUG-1352
|
|
|
|
|
|
|
|
|
| |
This allows to set the sslPeerName even when not using
connectToHostEncrypted, but rather connectToHost + startClientEncryption
Task-number: QTBUG-1352
Merge-request: 1110
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
As suggested by p--hartmann in a comment for MR 1574.
Task-number: QTBUG-1352
Merge-request: 1110
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|
|
|
|
|
|
|
| |
...to client QSslSocket connections when supported by openssl as per
task tracker id #188841
Merge-request: 1574
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
In the Unbuffered QTcpSocket mode the read() call could
go to the socket engine even though we are not connected right now.
Reviewed-by: Peter Hartmann
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Do not call read() if the socket engine is already invalid.
This could happen when using the Unbuffered QTcpSocket mode which
is currently only used inside QNetworkAccessManager.
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
moc was starting to parse function one token too late. This was usually
unnoticed because there is usually a semi colon, or a colon, or some
other token that are ignored. But in this case, a Q_PROPERTY is not
ignored, the parsing would fail.
Reviewed-by: brad
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17731
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
So that if these font engines are deallocated elsewhere (by
QFontCache for instance), we can still access them in QTextEngine.
Task-number: QTBUG-17603
Reviewed-by: Eskil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a case where finished() and finishedWithError()
were both emitted for a single reply.
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | | |
Proper bugfix will come with later commit.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, on initializing the first QSslSocket, we read all root
certificates into memory (~ 150 files).
Now, we tell OpenSSL where to find the root certificates, so that they
can be loaded on demand (if supported, see 'man c_rehash' for details).
Reviewed-by: Markus Goetz
Task-number: QTBUG-14016
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using file engines directly does not anymore have the benefit intended.
We now use QFile again as we did before.
Reviewed-by: Martin Petersson
|
| | |
| | |
| | |
| | | |
Reviewed-by: Peter Hartmann
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
HTTP requests are run in a separate thread now.
This required some big changes in the QNetworkAccessHttpBackend.
There is a new class QHttpThreadDelegate which lives in the
HTTP thread and is the communication layer between HTTP code
and QNetworkAccessHttpBackend. Communication is done
via signals/slots.
The synchronous HTTP code (private QtWebKit API) also had to
be completely re-worked and uses its own thread now.
Reviewed-by: Peter Hartmann
Task-number: QTBUG-14162
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QPixmap::handle(): Pixmap is not an X11 class pixmap
The problem was that the QBitmap constructor would re-create a
copy of the bitmap in a image (because we are using the raster
graphicssystem)
Reviewed-by: sroedal
|
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes the tst_qnetworkreply getFromUnreachableIp() test on Windows.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the connecting process is in progress we should not enable the
read notifier. This will be done when we are connected. This fixes the
tst_qnetworkreply proxyChange() on Windows.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17469
Reviewed-by: Joao
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Add files deployed using qmake_emulator_deployment.flm to 'what' list
QRuntimeWindowSystem: Track window size properly
|
| |\ \ \ |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QRuntimeWindowSystem: Track window size properly
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The runtime window system has a 'proxy' window surface which wraps the
currently active window surface. When the window geometry changes, the
new geometry is properly communicated to the wrapped window surface.
However, the new geometry is not updated into the runtime window surface
proxy itself, which means that when queried, the geometry for the window
surface will always be invalid. This patch fixes the issue.
Fixes: QT-4588
Merge-request: 1098
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (60 commits)
Fix QTBUG-17627: build break in mobility bearer applications
Add the missing image for doc of QNetworkSession.
Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
Fix QPlainTextEdit corruption/crash with scrolling
DelayRemove of list delegate on section boundary duplicated section
add gsm to connectable bearer for networkmanager.
ListView and GridView indexAt should use qreal coordinates.
Prevent infinite loop in raster engine on zero dash pattern length.
Cocoa: Sheets looses focus when moving parent window
Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changeset
Fix QNetworkConfigurationManager crash due to null private pointer.
Fix animations with alwaysRunToEnd that are frequently stopped/started.
Fix auto test failure on mac.
Update QtGui def files
Another stab at fixing compilation on old Symbian platforms
Prevent an animation from being registered to run twice.
Add missing test file.
Add selected P1 tasks to changes file.
Added support for QMAKE_CLEAN in symbian-sbsv2
Only add NetworkServices capability automatically if no caps are set.
...
|
| |\ \ \ \ \
| | |/ / / / |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QTBUG-17627: build break in mobility bearer applications
|