diff --git a/dap_client.c b/dap_client.c
index 391b95b3cf45dfa00bb237f7548e034884a6828a..32a47fbb61b4bd24e1f66b3057238fb12bd1a246 100644
--- a/dap_client.c
+++ b/dap_client.c
@@ -302,8 +302,12 @@ int dap_client_disconnect( dap_client_t *a_client )
 //            l_client_internal->stream_es = NULL;
 //        }
 
+<<<<<<< HEAD
 //        l_client_internal->stream_es->signal_close = true;
         dap_events_kill_socket( l_client_internal->stream_es );
+=======
+        l_client_internal->stream_es->signal_close = true;
+>>>>>>> bec1af426c69b6a96e831f61603c00135bbd9305
 
 //        if (l_client_internal->stream_socket ) {
 //            close (l_client_internal->stream_socket);
diff --git a/libdap b/libdap
index 999a4bc46231c2398a8d010dee06628965b3c478..d37b2aa26d2a7cc068529db343a87fd728904d33 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 999a4bc46231c2398a8d010dee06628965b3c478
+Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33
diff --git a/libdap-server b/libdap-server
index 1b3a871d6ec93801f14081de51157bbb703593f1..2520382b703cc4308a6bb017da3b2cc5b95083b9 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit 1b3a871d6ec93801f14081de51157bbb703593f1
+Subproject commit 2520382b703cc4308a6bb017da3b2cc5b95083b9
diff --git a/libdap-server-core b/libdap-server-core
index 7c6065bc699760e6e66ee4e80861a3562b2366c1..e5bb9b75237cd702c5980b4070da9842d1f101e2 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit 7c6065bc699760e6e66ee4e80861a3562b2366c1
+Subproject commit e5bb9b75237cd702c5980b4070da9842d1f101e2
diff --git a/libdap-server-udp b/libdap-server-udp
index 19a6376646f497d97bfe1ea3fade1a907c32f76a..1668210c08275ec85f8278a80c66b50e7414d61c 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 19a6376646f497d97bfe1ea3fade1a907c32f76a
+Subproject commit 1668210c08275ec85f8278a80c66b50e7414d61c
diff --git a/libdap-stream b/libdap-stream
index 8fa982b5333a4ea85429fe772987f9d84e5fb96e..550a546222f8b07c0687c9feaea32d3f2c66e87c 160000
--- a/libdap-stream
+++ b/libdap-stream
@@ -1 +1 @@
-Subproject commit 8fa982b5333a4ea85429fe772987f9d84e5fb96e
+Subproject commit 550a546222f8b07c0687c9feaea32d3f2c66e87c
diff --git a/libdap-stream-ch b/libdap-stream-ch
index dfbdaa1df0498069e60ffaf42de963375bffa816..268f422bde88a5f4f254a31b7d52b18d2cad71fc 160000
--- a/libdap-stream-ch
+++ b/libdap-stream-ch
@@ -1 +1 @@
-Subproject commit dfbdaa1df0498069e60ffaf42de963375bffa816
+Subproject commit 268f422bde88a5f4f254a31b7d52b18d2cad71fc