[Qemu-devel] [PULL v1 00/11] Merge qio 2017/10/04

[Daniel P. Berrange]

The following changes since commit d147f7e815f97cb477e223586bcb80c316ae10ea:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 
(2017-10-03 16:27:24 +0100)

are available in the git repository at:

  git://github.com/berrange/qemu tags/pull-qio-2017-10-04-1

for you to fetch changes up to 59f183bbd54eecffb8915bffe03f9c2720b28bcc:

  io: add trace events for websockets frame handling (2017-10-04 13:21:53 +0100)

----------------------------------------------------------------
Merge qio 2017/10/04 v1

----------------------------------------------------------------

Brandon Carpenter (7):
  ui: Always remove an old VNC channel watch before adding a new one
  io: Small updates in preparation for websocket changes
  io: Add support for fragmented websocket binary frames
  io: Allow empty websocket payload
  io: Ignore websocket PING and PONG frames
  io: Reply to ping frames
  io: Attempt to send websocket close messages to client

Daniel P. Berrange (4):
  io: send proper HTTP response for websocket errors
  io: include full error message in websocket handshake trace
  io: use case insensitive check for Connection & Upgrade websock
    headers
  io: add trace events for websockets frame handling

 include/io/channel-websock.h |   2 +
 io/channel-websock.c         | 496 +++++++++++++++++++++++++++++--------------
 io/trace-events              |   7 +-
 ui/vnc-auth-vencrypt.c       |   3 +
 ui/vnc-ws.c                  |   6 +
 ui/vnc.c                     |   4 +
 6 files changed, 362 insertions(+), 156 deletions(-)

-- 
2.13.5