diff options
| author | Christian Beier <dontmind@freeshell.org> | 2015-01-18 15:49:52 +0100 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2015-01-18 15:49:52 +0100 |
| commit | 1f5f1679a9858818dcbbcff59beda5f85d304f04 (patch) | |
| tree | a64172c5ec33b61310f0ddb65619caab203a3996 /libvncserver/sockets.c | |
| parent | b568db93b9f27877deec89c5bc434c71bb30a16d (diff) | |
| parent | 6836ccb208f8c16824b8c1e330acb077c70c98c6 (diff) | |
| download | libtdevnc-1f5f1679a9858818dcbbcff59beda5f85d304f04.tar.gz libtdevnc-1f5f1679a9858818dcbbcff59beda5f85d304f04.zip | |
Merge pull request #57 from maxnet/master
Fix handling of multiple VNC commands per websockets frame
Diffstat (limited to 'libvncserver/sockets.c')
| -rw-r--r-- | libvncserver/sockets.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c index a9c5a2c..2bb655e 100644 --- a/libvncserver/sockets.c +++ b/libvncserver/sockets.c @@ -391,7 +391,15 @@ rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec) if (FD_ISSET(cl->sock, &(rfbScreen->allFds))) { if (FD_ISSET(cl->sock, &fds)) + { +#ifdef LIBVNCSERVER_WITH_WEBSOCKETS + do { + rfbProcessClientMessage(cl); + } while (webSocketsHasDataInBuffer(cl)); +#else rfbProcessClientMessage(cl); +#endif + } else rfbSendFileTransferChunk(cl); } |