| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
| |
Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.
Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
|
| |
|
|
|
|
|
|
| |
start() is only defined when using bearer management; that method calls
open(), which we just call directly if not using bearer.
Reviewed-by: Markus Goetz
Task-number: QTBUG-16477
|
| |
|
|
|
| |
We don't think this is the right solution.
This reverts commit de72670c620e1193fa875bf1a4adee553700bacb.
|
| |
|
|
| |
forgot the QT_END_NAMESPACE macro.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was the following: According to the cookie RFC, domains must
have at least one dot in their name for setting a cookie (e.g. domain
example.com can set a cookie for ".example.com" but not for ".com").
The problem is: Following this rule, one could still set "supercookies"
for e.g. ".co.uk".
The solution is to generate a table from
http://publicsuffix.org which maintains a list of all "effective" TLDs
like e.g. ".co.uk".
Reviewed-by: Olivier Goffart
Task-number: QTBUG-14706
|
| |
|
|
|
|
|
|
| |
During download, if a QAbstractSocket::RemoteHostClosedError occurs, the error handling is deferred to _q_disconnected() slot. However, the error message is not saved for the function, and thus the _q_disconnected only emits a finished-signal.
We now store an unhandled error into a private member. It is handled and reset by the _q_disconnected (or more specifically, allDone-function). Also, an additional check is made that there are no simultaneous HTTP errors. If a HTTP error exists, any socket errors are suppressed.
Task-Number: QT-3494
Reviewed-By: Markus Goetz
|
| |
|
|
|
|
|
|
|
|
| |
When an active QNetworkConfiguration is already in use (e.g. browser
already open), the QNetworkSession::waitForOpened() did not work
properly. Changed one if-statement in the function to adapt to the
scenario.
Reviewed-by: Perttu Pohjonen
Task-number: QTBUG-565
|
| |
|
|
| |
Reviewed-By: Trust Me
|
| |
|
|
|
|
|
| |
Otherwise the connections will stay in a zombie state until the TCP
keep alive timer times out in a couple of hours.
Task-number: Maemo 201619
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Fix strict-aliasing violation warning.
Fix warning about %x parameter type mismatch in EGL
Fix warning about address of a function being constant.
Fix warnings related to unused variables.
Fix silly "will be initialised after" warning.
Fix warning about mixing integral with non-integral type in ?:
Fix warning about use of uninitialised variable
Fix "value not in enum" warning with GCC 4.5.
Fix warnings with GCC 4.5: some cases are not part of the enum
Fix a race condition related to service acquisition.
QNetworkReply autotest: fix possible crash
QKqueueFileSystemWatcher: don't stop thread that isn't running
Fix QSettings auto test to use QTRY_VERIFY
tst_QFileSystemWatcher: Don't exit the event loop on first signal.
QPollingFileSystemWatcherEngine: Fix double report of directory change.
QKqueueFileSystemWatcherEngine: Use higher file descriptors.
QKqueueFileSystemWatcherEngine: Unlock mutex between two events.
QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).
QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.
QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().
...
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
QLocalSocket/Win: do not emit error() when no error actually occurred
Doc: fix typo
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a regression in 4d0c4b9f09b35d707d437611519d0024f6f87a8c.
Previously the error string was set if the error is not
ERROR_PIPE_NOT_CONNECTED but the commit changed this behaviour to set
the error string if it is ERROR_PIPE_NOT_CONNECTED.
Task-number: QTBUG-13646
Merge-request: 941
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit cbf7a7782f465846455a5fd5df339ebde31a5521.
This commit caused autotest regressions in tst_qdeclarativeloader and
tst_qdeclarativetext; reverting it for now until this has been
resolved.
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a missing error-signal when a server is shut down while downloading
Ensure that if this is does not have a valid filter when on XP or less
HTTP backend: fix build without Qt3 support
QNetworkAccessManager: enable synchronous HTTP calls
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Markus Goetz
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
To enable synchronous calls, an attribute in the QNetworkRequest has
to be set. If set, when QNetworkAccessManager::get() (and post(),
put()) returns, the reply is finished and all data has been read in
case of success.
This feature is semi-public for now (usable, but not documented).
To enable this, an attribute in the QNetworkRequest must be set. If
this attribute is set, we open a new connection to the server with
only one channel and call the channels' sockets' waitFor* methods.
Reviewed-by: Markus Goetz
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QT-3494: During download, if a QAbstractSocket::RemoteHostClosedError occurs, the
error handling is deferred to _q_disconnected() slot. However, the error
message is not saved for the function, and thus the _q_disconnected only
emits a finished-signal.
Solution: Store an unhandled error into a private member. It is handled and
reset by the _q_disconnected (or more specifically, allDone-function).
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Fixed handling of QInputMethodEvents with nonzero replacementLength.
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
Documented usage of dialogs on Symbian
Native file dialog on Symbian^3
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
...
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On symbian, thread names must be unique (actually kernel object names)
When a thread exits, there may still be open handles, for example a
debugger or RUndertaker so the thread name cannot be reused immediately.
S60 has an RUndertaker instance in a background thread, which is used
to display the "application closed" messages when a crash happens.
Until that thread has run and checked the thread exit to see if it was
a crash or not, the thread remains open.
When systemCaCertificates is called as the first API call, it calls itself
via ensureinitialised() to set the default CA certs. This double call
should be addressed by QTBUG-15218.
In any case, QSslSocket::systemCaCertificates() is intended to refresh
from the system - if application code calls it too quickly in succession it
could also trigger this bug.
Task-number: QTBUG-15126
Reviewed-by: Markus Goetz
|
| | |/ /
|/| | |
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-15311
Reviewed-by: ogoffart
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The FreeBSD base system does not ship a certificate bundle, but the
ca_root_nss port provides one extracted from Mozilla's root CA list.
As discussed in QTBUG-14013, it should be preferrable to have bundle
files than separate certificate files, so the path for the certificate
has been added directly.
Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com>
Merge-request: 896
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
... and not only the last one. One call to OpenSSL can produce several
errors, which we should always read all. Otherwise, malicious clients
could intentionally poison the error queue.
Inspired-by: Merge request 2290
Reviewed-by: Olivier Goffart
Reviewed-by: Markus Goetz
Task-number: QTBUG-14513
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added error handling to the certificate retrieval thread
Made the certificate retrieval thread process critical (so if it crashes
the process will crash instead of hang)
Filter the certificate list to only fetch CA certificates which are in
X.509 format (symbian also allows WAP formats, but Qt does not support
these).
Put the TPtr8 for asynch function parameter in the class data so it does
not go out of scope while the function is in progress. Previously it was
on the stack so it could be corrupted before the certificate server had
finished using it.
Task-number: QTBUG-15005
Task-number: QTBUG-15126
Reviewed-by: Markus Goetz
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move the creation code to the top of QNAM::createRequest()
to avoid setting up a QNetworkSession when it is not needed.
Reviewed-by: ogoffart
|
| | | | |
|
| |/ /
| |
| |
| | |
Reviewed-by: Thiago Macieira
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
Give the toplevel widget a layout
fix tests when using Qt in a namespace
Fix tst_symbols auto test
trivial: fix build
Fix crash
fix isLikelyToBeNfs usage
Export isLikelyToBeNfs only if we have an internal build
Fixed QGraphicsView autotest to use a dummy toplevel widget
Fixed QMdiArea autotest to use a dummy toplevel widget.
Fixed QMenuBar autotest. Changed window activation order.
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
Fixed QPathCliper autotest, to skip a test when qreal != double
Fixed QComboBox autotest to use a dummy toplevel widget
Fixed QColumnView autotest. Added an QApplication::processEvents
Fixed QAccessability autotest to use a dummy toplevel widget
Fix QListWidget test
Fix QGraphicsItems autotest
Fixed QGraphicsScene autotest to use a dummy toplevel widget
Fixed QGraphicsItem autotest to use a dummy toplevel widget
Fixed QListView autotest to use a dummy toplevel widget
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits)
trivial: fix build
Fix crash
fix isLikelyToBeNfs usage
Export isLikelyToBeNfs only if we have an internal build
Fixed QGraphicsView autotest to use a dummy toplevel widget
Fixed QMdiArea autotest to use a dummy toplevel widget.
Fixed QMenuBar autotest. Changed window activation order.
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
Fixed QPathCliper autotest, to skip a test when qreal != double
Fixed QComboBox autotest to use a dummy toplevel widget
Fixed QColumnView autotest. Added an QApplication::processEvents
Fixed QAccessability autotest to use a dummy toplevel widget
Fix QListWidget test
Fix QGraphicsItems autotest
Fixed QGraphicsScene autotest to use a dummy toplevel widget
Fixed QGraphicsItem autotest to use a dummy toplevel widget
Fixed QListView autotest to use a dummy toplevel widget
Fixed QMenu autotest to use a dummy toplevel widget
Fixed QMenuBar autotest. Added mainwindow activation
Fixed QString autotest when QT_QLOCALE_USES_FCVT is set
...
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
check the global network proxy for 0 before dereferencing
Reviewed-by: Robert Griebl
|
| |/ / /
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
|
| |/ /
| |
| |
| |
| |
| |
| | |
Reset authenticator and fix operator=(...) of QAuthenticator.
Task-number: QTBUG-6792
Reviewed-by: ogoffart
|
| | |
| |
| |
| | |
Reviewed-by: Morten Engvoldsen
|
| | |
| |
| |
| |
| |
| | |
Me no speak americano.
Reviewed-by: Peter Hartmann
|
| | |
| |
| |
| |
| |
| |
| |
| | |
* winsock2.h conflicts with qplatformdefs.h
* ifndef QT_NO_OPENSSL was missing
Reviewed-by: Prasanth
Reviewed-by: Markus Goetz
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Removed the distinction between reply error and connection error.
The QNetworkAccessManager was treating them the same way anyway.
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | |
| |
| |
| |
| | |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | |
| |
| |
| |
| | |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | |
| |
| |
| |
| | |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | |
| |
| |
| |
| | |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | |
| |
| |
| |
| | |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | |
| |
| |
| |
| | |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
