ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.2.stable

Browse Source 
Conflicts:
	configure.in
This commit is contained in:
Ken Rice
2013-03-06 23:40:51 -06:00
parent 73a07e41c0 1a1153e04a
commit 0a2e713593
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fs_encode.c
-1
View File
@@ -246,7 +246,6 @@ int main(int argc, char *argv[])
&encoded_rate,
&flags);
encoded_len /= 2;
printf("WTF %ld %d %d\n", len, encoded_rate, encoded_len);
len = encoded_len;
}
}
src/mod/endpoints/mod_sofia/mod_sofia.c
+2 -2
View File
@@ -5262,9 +5262,9 @@ static void general_event_handler(switch_event_t *event)
}
switch_mutex_lock(profile->ireg_mutex);
switch_mutex_lock(profile->dbh_mutex);
sofia_glue_execute_sql_callback(profile, NULL, sql, notify_callback, profile);
switch_mutex_unlock(profile->ireg_mutex);
switch_mutex_unlock(profile->dbh_mutex);
sofia_glue_release_profile(profile);
free(sql);
src/mod/endpoints/mod_sofia/sofia_glue.c
+2 -2
View File
@@ -6414,9 +6414,9 @@ void sofia_glue_execute_sql_now(sofia_profile_t *profile, char **sqlp, switch_bo
switch_assert(sqlp && *sqlp);
sql = *sqlp;
switch_mutex_lock(profile->ireg_mutex);
switch_mutex_lock(profile->dbh_mutex);
switch_sql_queue_manager_push_confirm(profile->qm, sql, 0, !sql_already_dynamic);
switch_mutex_unlock(profile->ireg_mutex);
switch_mutex_unlock(profile->dbh_mutex);
if (sql_already_dynamic) {
*sqlp = NULL;
src/mod/endpoints/mod_sofia/sofia_presence.c
+3 -1
View File
@@ -4072,7 +4072,9 @@ void sofia_presence_handle_sip_i_subscribe(int status,
nua_respond(nh, 481, "INVALID SUBSCRIPTION", TAG_END());
}
nua_handle_destroy(nh);
if (!sofia_private || !sofia_private->is_call) {
nua_handle_destroy(nh);
}
}