Skip to content
Snippets Groups Projects
Commit 6ba7a906 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[*] Some more fixes

parent 9727ee05
No related branches found
No related tags found
1 merge request!263Master
Pipeline #6622 passed with stage
in 14 seconds
...@@ -221,23 +221,32 @@ static void s_es_delete(dap_events_socket_t * a_es, void * a_arg) ...@@ -221,23 +221,32 @@ static void s_es_delete(dap_events_socket_t * a_es, void * a_arg)
dap_client_http_pvt_t * l_client_http_internal = PVT(a_es); dap_client_http_pvt_t * l_client_http_internal = PVT(a_es);
if (! l_client_http_internal->were_callbacks_called){ if (! l_client_http_internal->were_callbacks_called){
size_t l_response_size = l_client_http_internal->response_size> l_client_http_internal->header_length ?
l_client_http_internal->response_size - l_client_http_internal->header_length: 0;
if (l_client_http_internal->content_length){ if (l_client_http_internal->content_length){
log_it(L_WARNING, "Remote server disconnected before he sends all data: %zd data in buffer when expected %zd", log_it(L_WARNING, "Remote server disconnected before he sends all data: %zd data in buffer when expected %zd",
l_client_http_internal->response_size, l_client_http_internal->content_length); l_client_http_internal->response_size, l_client_http_internal->content_length);
l_client_http_internal->error_callback(-666, l_client_http_internal->obj); // -666 means remote server disconnected before he sends all l_client_http_internal->error_callback(-666, l_client_http_internal->obj); // -666 means remote server disconnected before he sends all
}else if (l_client_http_internal->response_size){ }else if (l_response_size){
log_it(L_INFO, "Remote server replied without no content legth but we have the response %zd bytes size", log_it(L_INFO, "Remote server replied without no content legth but we have the response %zd bytes size",
l_client_http_internal->response_size); l_response_size);
if(l_client_http_internal->response_callback)
l_client_http_internal->error_callback(-10 , l_client_http_internal->obj);
/* if(l_client_http_internal->response_callback)
l_client_http_internal->response_callback( l_client_http_internal->response_callback(
l_client_http_internal->response + l_client_http_internal->header_length, l_client_http_internal->response + l_client_http_internal->header_length,
l_client_http_internal->response_size> l_client_http_internal->header_length ? l_response_size,
l_client_http_internal->response_size - l_client_http_internal->header_length: 0, l_client_http_internal->obj);*/
l_client_http_internal->obj); l_client_http_internal->were_callbacks_called = true;
}else if (l_client_http_internal->response_size){
log_it(L_INFO, "Remote server disconnected with reply. Body is empty, only headers are in");
l_client_http_internal->error_callback(-667 , l_client_http_internal->obj); // -667 means remote server replied only with headers
l_client_http_internal->were_callbacks_called = true; l_client_http_internal->were_callbacks_called = true;
}else{ }else{
log_it(L_WARNING, "Remote server disconnected without reply"); log_it(L_WARNING, "Remote server disconnected without reply");
l_client_http_internal->error_callback(-667, l_client_http_internal->obj); // -667 means remote server disconnected before he sends anythinh l_client_http_internal->error_callback(-668, l_client_http_internal->obj); // -668 means remote server disconnected before he sends anythinh
l_client_http_internal->were_callbacks_called = true;
} }
} }
s_client_http_delete(PVT(a_es)); s_client_http_delete(PVT(a_es));
......
...@@ -98,7 +98,6 @@ dap_enc_ks_key_t * dap_enc_ks_find(const char * v_id) ...@@ -98,7 +98,6 @@ dap_enc_ks_key_t * dap_enc_ks_find(const char * v_id)
return ret; return ret;
}*/ }*/
} }
log_it(L_WARNING, "Key not found");
} }
return ret; return ret;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment