Skip to content

Commit 63f6ed7

Browse files
committed
Update wslay
1 parent a151b5b commit 63f6ed7

23 files changed

+2085
-1606
lines changed

deps/wslay/NEWS

+60-25
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,82 @@
1-
wslay 1.0.0
1+
wslay 1.1.1
22
===========
33

44
Release Note
55
------------
66

7-
This release fixes several build issues. Most changes were introduced
8-
by contributors. Thank you for all the contributions in this project.
9-
Because wslay is very stable since the previous release (more than 2
10-
years ago), we mark this release 1.0.0.
7+
This release fixes the bug that eof is not evaluated after the
8+
invocation of read_callback.
119

1210
Changes
1311
-------
1412

15-
* Fix NULL check in wslay_frame_context_init.
13+
* Check for eof when read_callback returns 0 (GH-47)
1614

17-
Patch from Witchakorn Kamolpornwijit
15+
Patch from Robert Bragg
1816

19-
* the examples uses epoll and thus only be built on linux
17+
2018

21-
Patch from Kazuho Oku
19+
wslay 1.1.0
20+
===========
21+
22+
Release Note
23+
------------
24+
25+
This release adds CMake build support and the ability to set and
26+
verify reserved bits. Build issue with nettle >= 3.4 was fixed.
27+
28+
Changes
29+
-------
30+
31+
* Fix compilation of examples
32+
33+
Since 3.4 nettle defines base64_encode_raw like this:
34+
35+
void base64_encode_raw(char *dst, size_t length, const uint8_t *src);
36+
37+
So examples have to be adjusted. More read at
38+
https://git.lysator.liu.se/nettle/nettle/blob/nettle_3.4_release_20171119/NEWS#L49-53
39+
40+
Patch from Sergey Avseyev
41+
42+
* check for 0 length before memcpy:
43+
44+
.../wslay/lib/wslay_event.c:304:7: runtime error: null pointer passed as argument 2, which is declared to never be null
45+
46+
Patch from Anders Bakken
47+
48+
* Skip UTF-8 validation for PMCE fragments
49+
50+
If the message was marked with rsv1 on the initial frame then we
51+
should skip utf-8 validation on subsequent continuation frames as
52+
well.
53+
54+
Added test for this case.
55+
56+
Found by autobahn wstest tool.
57+
58+
Patch from Isaac Boukris
59+
60+
* Allow RSV1 bit in event-based API for PMCE - RFC 7692
2261

23-
* build: allow one to build out-of-tree documentation
62+
Add a new function wslay_event_set_allowed_rsv_bits which only accpet
63+
RSV1 for now (or 0 to disable).
2464

25-
Patch from Vincent Bernat
65+
Skip UTF-8 validation on frames with RSV1 set as it is too early for that.
2666

27-
* build: fix `./configure` when nettle is not present
67+
Add extended versions of wslay_event_queue_msg functions which also
68+
take the reserved bits to set for this message.
2869

29-
`PKG_CHECK_MODULES` will fail unless we give it an action to execute
30-
on failure. When nettle is not available, we set `have_nettle` to
31-
`no`.
70+
Patch from Isaac Boukris
3271

33-
Patch from Vincent Bernat
72+
* fixed missing malloc guard
3473

35-
* Adds the ability to override the version header include with a
36-
define. This enables projects to set the build version from the
37-
compile environment and avoid the need to generate the version
38-
header.
74+
Patch from Jakub Piskorz
3975

40-
Patch from Ben Vanik
76+
* Fix argc check.
4177

42-
* Improve http_handshake in fork-echoserver.
78+
Patch from Anders Bakken
4379

44-
Patch from Gurjeet Singh
80+
* CMake support
4581

46-
* Don't send any pending control frame other than Close control frame
47-
after Close is queued.
82+
Patch from wonder-mice

deps/wslay/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Wslay - The WebSocket library
22
=============================
33

4-
Project Web: https://github.com/tatsuhiro-t/wslay
4+
Project Web: https://tatsuhiro-t.github.io/wslay/
55

66
Wslay is a WebSocket library written in C.
77
It implements the protocol version 13 described in

deps/wslay/configure.ac

+11-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ dnl LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2121
dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2222
dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2323
AC_PREREQ(2.61)
24-
AC_INIT([wslay], [1.0.1-DEV], [t-tujikawa@users.sourceforge.net])
24+
AC_INIT([wslay], [1.1.1], [t-tujikawa@users.sourceforge.net])
2525
LT_PREREQ([2.2.6])
2626
LT_INIT()
2727
AC_CONFIG_AUX_DIR([.])
2828
dnl See versioning rule:
2929
dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
30-
AC_SUBST(LT_CURRENT, 0)
30+
AC_SUBST(LT_CURRENT, 1)
3131
AC_SUBST(LT_REVISION, 1)
32-
AC_SUBST(LT_AGE, 0)
32+
AC_SUBST(LT_AGE, 1)
3333

3434
AC_CANONICAL_BUILD
3535
AC_CANONICAL_HOST
@@ -40,6 +40,14 @@ AC_CONFIG_MACRO_DIR([m4])
4040
AM_INIT_AUTOMAKE()
4141
AC_CONFIG_HEADERS([config.h])
4242

43+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
44+
45+
# Checks for command-line options
46+
AC_ARG_ENABLE([werror],
47+
[AS_HELP_STRING([--enable-werror],
48+
[Turn on compile time warnings])],
49+
[werror=$enableval], [werror=no])
50+
4351
dnl Checks for programs
4452
AC_PROG_CC
4553
AC_PROG_CXX

0 commit comments

Comments
 (0)