diff --git a/http_server/http_client/dap_http_client.c b/http_server/http_client/dap_http_client.c
index 7d20c29dafb2bf9c22764c6d73bb832397d2c03b..430a7418c9fb0d9e41a2a50d056a95d6f5a5eba4 100755
--- a/http_server/http_client/dap_http_client.c
+++ b/http_server/http_client/dap_http_client.c
@@ -599,14 +599,14 @@ void dap_http_client_out_header_generate(dap_http_client_t *cl_ht)
 {
   char buf[1024];
   time_t current_time = time( NULL );
-  time_to_str_rfc822( buf, sizeof(buf), current_time );
+  dap_time_to_str_rfc822( buf, sizeof(buf), current_time );
 
   dap_http_header_add( &cl_ht->out_headers,"Date", buf );
 
   if ( cl_ht->reply_status_code == 200 ) {
 
     if ( cl_ht->out_last_modified ) {
-      time_to_str_rfc822( buf, sizeof(buf), cl_ht->out_last_modified );
+      dap_time_to_str_rfc822( buf, sizeof(buf), cl_ht->out_last_modified );
       dap_http_header_add( &cl_ht->out_headers, "Last-Modified", buf );
     }
     if ( cl_ht->out_content_type[0] ) {
diff --git a/libdap b/libdap
index 1b6cbd3934284b71dbafa4d113fd6017e5570217..d37b2aa26d2a7cc068529db343a87fd728904d33 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 1b6cbd3934284b71dbafa4d113fd6017e5570217
+Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33
diff --git a/libdap-server-core b/libdap-server-core
index a66ffaa58fd87ea9af2e800e7a1b03c1593ef1a5..e5bb9b75237cd702c5980b4070da9842d1f101e2 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit a66ffaa58fd87ea9af2e800e7a1b03c1593ef1a5
+Subproject commit e5bb9b75237cd702c5980b4070da9842d1f101e2
diff --git a/libdap-server-udp b/libdap-server-udp
index 0e79b2d029516ed1dcbc9b4c6d4bfe5882d3753e..1668210c08275ec85f8278a80c66b50e7414d61c 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 0e79b2d029516ed1dcbc9b4c6d4bfe5882d3753e
+Subproject commit 1668210c08275ec85f8278a80c66b50e7414d61c