changeset
merge
Tue, 24 Jan 2017 17:36:28 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 24 Jan 2017 17:36:28 +0100
- changeset 155
- 36cd2e280386
- parent 154
- 6394ce09889a (current diff)
- parent 153
- 85320d8b5d5c (diff)
- child 156
- 724e107983e9
- child 157
- a0c8e752490d
merge
--- a/src/server/daemon/event_solaris.c Tue Jan 24 17:36:04 2017 +0100 +++ b/src/server/daemon/event_solaris.c Tue Jan 24 17:36:28 2017 +0100 @@ -158,7 +158,7 @@ int ev_pollout(event_handler_t *h, int fd, event_t *event) { event->object = (intptr_t)fd; event->events = POLLOUT; - event->poll EVENT_POLLOUT; + event->poll = EVENT_POLLOUT; return port_associate( ev_get_port(h), PORT_SOURCE_FD,
--- a/src/server/daemon/websocket.c Tue Jan 24 17:36:04 2017 +0100 +++ b/src/server/daemon/websocket.c Tue Jan 24 17:36:28 2017 +0100 @@ -304,7 +304,7 @@ NSAPI_PUBLIC int websocket_send_text(SYS_NETFD csd, char *msg, size_t len) { char frame[WS_FRAMEHEADER_BUFLEN]; - frame[0] = 0b10000001; + frame[0] = 129; // 0b10000001 size_t hlen; if(len < 126) { frame[1] = (char)len;
