diff --git a/configure.in b/configure.in index 46068f80e7..0867323da7 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.2.6], bugs@freeswitch.org) +AC_INIT([freeswitch], [1.2.7], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [2]) AC_SUBST(SWITCH_VERSION_MICRO, [7]) diff --git a/docs/phrase/phrase_en.xml b/docs/phrase/phrase_en.xml index 52f789ce15..9fdcd924db 100644 --- a/docs/phrase/phrase_en.xml +++ b/docs/phrase/phrase_en.xml @@ -628,6 +628,16 @@ + + + + + + + + + + diff --git a/src/fs_encode.c b/src/fs_encode.c index 364b336544..b1beb36b43 100644 --- a/src/fs_encode.c +++ b/src/fs_encode.c @@ -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; } } diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index f0d0ab280b..241cf88c2d 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -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); diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index 5c40dc10be..0d764391bd 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -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; diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index 3547130446..f49b138566 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -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); + } }