ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@git.freeswitch.org:freeswitch

Browse Source
This commit is contained in:
David Yat Sin
2010-04-27 14:32:55 -04:00
parent 318866b7f9 825bf99daa
commit 75190b4dff
36 changed files with 751 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/esl/src/esl.c
+1 -1
View File
@@ -786,7 +786,7 @@ ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms
return ESL_FAIL;
}
if (esl_mutex_trylock(handle->mutex) != ESL_SUCCESS) {
if (activity == 0 || !FD_ISSET(handle->sock, &rfds) || (esl_mutex_trylock(handle->mutex) != ESL_SUCCESS)) {
return ESL_BREAK;
}
libs/libdingaling/src/libdingaling.c
+5 -1
View File
@@ -2179,7 +2179,11 @@ ldl_status ldl_session_get_payloads(ldl_session_t *session, ldl_payload_t **payl
ldl_status ldl_global_terminate(void)
{
ldl_clear_flag_locked((&globals), LDL_FLAG_READY);
if (globals.flag_mutex) {
ldl_clear_flag_locked((&globals), LDL_FLAG_READY);
} else {
ldl_clear_flag((&globals), LDL_FLAG_READY);
}
return LDL_STATUS_SUCCESS;
}