summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-06-16 06:38:30 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-06-16 06:38:30 +0000
commitdd8c59687f68b52216d44fb190884df044008899 (patch)
tree2e42c7ff249391d632a21a3e5c5662d946f51a30
parent0cdb4bdb143557f2d46a8512e5d2e9c877c70ec5 (diff)
Update to latest (nw)
-rw-r--r--src/emu/webengine.c2
-rw-r--r--src/lib/web/mongoose.c11
2 files changed, 10 insertions, 3 deletions
diff --git a/src/emu/webengine.c b/src/emu/webengine.c
index 2b961df87ee..1cedbed92dd 100644
--- a/src/emu/webengine.c
+++ b/src/emu/webengine.c
@@ -271,8 +271,6 @@ static int ev_handler(struct mg_connection *conn, enum mg_event ev) {
// This handler is called for each incoming websocket frame, one or more
// times for connection lifetime.
// Echo websocket data back to the client.
- //const char *msg = "update_machine";
- //mg_websocket_write(conn, 1, msg, strlen(msg));
return conn->content_len == 4 && !memcmp(conn->content, "exit", 4) ? MG_FALSE : MG_TRUE;
} else {
web_engine *engine = static_cast<web_engine *>(conn->server_param);
diff --git a/src/lib/web/mongoose.c b/src/lib/web/mongoose.c
index b98149acc30..57804c17566 100644
--- a/src/lib/web/mongoose.c
+++ b/src/lib/web/mongoose.c
@@ -548,6 +548,12 @@ static sock_t ns_open_listening_socket(union socket_address *sa) {
if ((sock = socket(sa->sa.sa_family, SOCK_STREAM, 6)) != INVALID_SOCKET &&
#ifndef _WIN32
+ // SO_RESUSEADDR is not enabled on Windows because the semantics of
+ // SO_REUSEADDR on UNIX and Windows is different. On Windows,
+ // SO_REUSEADDR allows to bind a socket to a port without error even if
+ // the port is already open by another program. This is not the behavior
+ // SO_REUSEADDR was designed for, and leads to hard-to-track failure
+ // scenarios. Therefore, SO_REUSEADDR was disabled on Windows.
!setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &on, sizeof(on)) &&
#endif
!bind(sock, &sa->sa, sa->sa.sa_family == AF_INET ?
@@ -4931,7 +4937,10 @@ static void mg_ev_handler(struct ns_connection *nc, enum ns_event ev, void *p) {
case NS_POLL:
if (call_user(conn, MG_POLL) == MG_TRUE) {
- nc->flags |= NSF_FINISHED_SENDING_DATA;
+ if (conn->ns_conn->flags & MG_HEADERS_SENT) {
+ write_terminating_chunk(conn);
+ }
+ close_local_endpoint(conn);
}
if (conn != NULL && conn->endpoint_type == EP_FILE) {