diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2021-07-14 19:58:48 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2021-07-24 11:52:30 +0300 |
| commit | d9c0af92bd893e1f6a0b4c627300ea96a73aba55 (patch) | |
| tree | 0bc36f07c99dbdc3dcd81eb83b31742b91fcd368 /src/network/socket | |
| parent | a7da8e0dab8f6290b2af9bc12c0cd391af30bfb7 (diff) | |
QLocalSocket/Unix: fix aborting the socket
According to the documentation, calling abort() should immediately
reset the socket to its initial state. This includes:
- closing the file descriptor;
- closing the QLocalSocket as an I/O device;
- canceling a pending outgoing connection, if it exist;
- reseting 'serverName' string.
So, adding a call to close() resets the state entirely.
Pick-to: 6.1 6.2
Change-Id: I9c604b5187c6300b437d7aa4c2d06db03edacf21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qlocalsocket_tcp.cpp | 1 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp index 1b6aa16c9b..a0f511b208 100644 --- a/src/network/socket/qlocalsocket_tcp.cpp +++ b/src/network/socket/qlocalsocket_tcp.cpp @@ -326,6 +326,7 @@ void QLocalSocket::abort() { Q_D(QLocalSocket); d->tcpSocket->abort(); + close(); } qint64 QLocalSocket::bytesAvailable() const diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 4dc542f2e3..2156644255 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -508,6 +508,7 @@ void QLocalSocket::abort() { Q_D(QLocalSocket); d->unixSocket.abort(); + close(); } qint64 QLocalSocket::bytesAvailable() const |