diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-02 10:53:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-02 10:53:00 +0000 |
| commit | 2959fb7fe50c3c22aabaaabf198a1b87d10e51f6 (patch) | |
| tree | 0771c1978dd635404ba72498a14599435b695794 /slirp/ip6_icmp.c | |
| parent | 4cb890b858bd1bd5935457401630d95754c4be48 (diff) | |
| parent | 1ad723e98b8499d0690f7f7eafc945908a1db634 (diff) | |
Merge remote-tracking branch 'remotes/elmarco/tags/chrdev-pull-request' into staging
- add websocket support
- socket: make 'fd' incompatible with 'reconnect'
- fix a websocket leak
- unrelated editorconfig patch that missed -trivial (included for
convenience)
- v2: fix commit author field
# gpg: Signature made Thu 01 Nov 2018 08:23:39 GMT
# gpg: using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/chrdev-pull-request:
editorconfig: set emacs mode
tests/test-char: Check websocket chardev functionality
chardev: Add websocket support
chardev/char-socket: Function headers refactoring
char-socket: make 'fd' incompatible with 'reconnect'
char-socket: correctly set has_reconnect when parsing QemuOpts
websock: fix handshake leak
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/ip6_icmp.c')
0 files changed, 0 insertions, 0 deletions