summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-061-0/+12
|\
| * Forward the readChannelFinished from the plain socket to the ssl socketAlbert Astals Cid2017-09-011-0/+12
| * Allow Secure Transport backend to use a temporary keychainTimur Pocheptsov2017-04-041-0/+7
* | QSslSocket: stabilize triggering for writeAlex Trotsenko2017-08-031-1/+10
* | QSSLSocket::readData return -1 when socket is not connectedAlbert Astals Cid2017-06-081-0/+2
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-281-6/+19
|\|
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-271-6/+19
| |\
| | * QSslSocket: fix connection to a international domain nameOlivier Goffart2017-03-231-6/+19
* | | Allow Secure Transport backend to use a temporary keychainTimur Pocheptsov2017-02-111-0/+7
|/ /
* / doc: Fix all remaining "Cannot tie" errors in QtBaseMartin Smith2017-01-061-1/+0
|/
* Remove last traces of MeeGoLars Knoll2016-11-231-1/+1
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-1/+1
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-1/+1
| |\
| | * Doc: Change instances of '(Mac) OS X' to 'macOS'Topi Reinio2016-08-121-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-191-1/+9
|\| |
| * | QSslSocket: reset connection parameters on disconnectAlex Trotsenko2016-07-051-0/+7
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-041-1/+2
| |\|
| | * QSslSocket: improve documentation of the supported protocolsGiuseppe D'Angelo2016-07-011-1/+2
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-131-1/+2
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-061-1/+2
| |\|
| | * OpenBSD: add /etc/ssl as cert dirRalf Nolden2016-06-011-1/+2
* | | Add settable QSslDiffieHellmanParameters for QSslSocket-based servers.Mikkel Krautz2016-05-251-0/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-121-2/+3
|\| |
| * | QtNetwork: eradicate Q_FOREACH loops [rvalues]Marc Mutz2016-05-041-1/+2
| * | QtNetwork: use const (and const APIs) moreAnton Kudryavtsev2016-04-271-1/+1
* | | Add support for PSK on server sideAndré Klitzing2016-05-021-0/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-03-221-0/+32
|\| |
| * | Integrate network sockets into the multichannel infrastructureAlex Trotsenko2016-03-011-0/+32
* | | QAbstractSocket::flush(): remove manual polymorphismAlex Trotsenko2016-03-011-9/+17
|/ /
* | Optimize QSslSocketPrivate::isMatchingHostname()Marc Mutz2016-02-081-7/+8
* | QRingBuffer: add append(const char *, qint64) functionAlex Trotsenko2016-02-011-2/+1
* | Updated license headersJani Heikkinen2016-01-151-14/+20
* | QIODevice: handle incomplete readsAlex Trotsenko2016-01-121-2/+2
* | QSslSocket: evaluate CAs in all keychain categoriesDaniel Molkentin2015-11-241-0/+4
|/
* Doc: replaced mentions of deprecated functionNico Vertriest2015-11-031-10/+9
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-231-2/+2
|\
| * Doc: Edit description of QSslSocket::AddCaCertificates()Topi Reinio2015-10-231-2/+2
* | Libraries: Fix single-character string literals.Friedemann Kleint2015-10-131-1/+1
* | QAbstractSocket: Consolidate error reportingKai Koehne2015-09-141-14/+7
|/
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Oswald Buddenhagen2015-08-121-0/+8
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-07-171-0/+8
| |\
| | * Network: Fix up previous corruption patchMarkus Goetz2015-07-081-0/+8
* | | QSslSocket: Update error string in setSocketDescriptor()Kai Koehne2015-08-031-0/+1
|/ /
* | Replace MAC OS X with OS XNico Vertriest2015-06-301-1/+1
* | QSslSocket: move default cipher, EC and default CA APIs to QSslConfigurationGiuseppe D'Angelo2015-06-111-134/+44
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-04-151-1/+1
|\|
| * QSslSocket: try to send all data on close()Alex Trotsenko2015-04-011-1/+1
* | Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-03-311-17/+4
|\|
| * Introduce qt_subtract_from_timeout to reduce code duplication.Daniel Teske2015-03-091-17/+4
* | Fix bind+connect in both TCP and UDPThiago Macieira2015-03-041-0/+23