diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-02 13:26:43 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-07 03:01:13 (GMT) |
| commit | 56d42fb51bcaada4c018384d702f421cbcdb15d9 (patch) | |
| tree | 08cba0ffbb361d8d9d13d05cc8a5dbd7fabe4a90 | |
| parent | 4f3e3b47c80c1efbb092d9d3f59cb88c6e367dfa (diff) | |
| download | Qt-56d42fb51bcaada4c018384d702f421cbcdb15d9.zip Qt-56d42fb51bcaada4c018384d702f421cbcdb15d9.tar.gz Qt-56d42fb51bcaada4c018384d702f421cbcdb15d9.tar.bz2 | |
open pipes in overlapped mode also on the client side
otherwise PeekNamedPipe() may block in threaded environments.
Reviewed-by: thiago
(cherry picked from commit 4948f4b188c6aa40e628d74d6d6fce747ee535bd)
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index f8ca0bd..d6717cb3 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -144,7 +144,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) 0, // no sharing NULL, // default security attributes OPEN_EXISTING, // opens existing pipe - 0, // default attributes + FILE_FLAG_OVERLAPPED, NULL); // no template file }, { localSocket = CreateFileA( @@ -153,7 +153,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode) 0, // no sharing NULL, // default security attributes OPEN_EXISTING, // opens existing pipe - 0, // default attributes + FILE_FLAG_OVERLAPPED, NULL); // no template file }); if (localSocket != INVALID_HANDLE_VALUE) |