# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1485275788 -3600
# Node ID 36cd2e280386cb8b919303cc81cb61c47c663965
# Parent  6394ce09889a034431106176463061a80dff94e6# Parent  85320d8b5d5c3302ef6e562828069703941be585
merge

diff -r 6394ce09889a -r 36cd2e280386 src/server/daemon/event_solaris.c
--- 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,
diff -r 6394ce09889a -r 36cd2e280386 src/server/daemon/websocket.c
--- 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;