From 522e73c85692fc206195a452b611ed03c12776b6 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 6 Mar 2013 13:59:34 -0600 Subject: [PATCH 1/8] bump --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index a6c132c327..31a4dd6f0f 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,10 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.3.15b], bugs@freeswitch.org) +AC_INIT([freeswitch], [1.3.15], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [3]) -AC_SUBST(SWITCH_VERSION_MICRO, [15b]) +AC_SUBST(SWITCH_VERSION_MICRO, [15]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, []) From 919586552c3805bfa90c3c2943da56da51b501e5 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 6 Mar 2013 14:00:21 -0600 Subject: [PATCH 2/8] bump --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 31a4dd6f0f..6280508a28 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,10 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.3.15], bugs@freeswitch.org) +AC_INIT([freeswitch], [1.3.16b], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [3]) -AC_SUBST(SWITCH_VERSION_MICRO, [15]) +AC_SUBST(SWITCH_VERSION_MICRO, [16b]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, []) From d7a9c18865728cace3c687de2c22065d264db6d4 Mon Sep 17 00:00:00 2001 From: Michael S Collins Date: Wed, 6 Mar 2013 16:42:18 -0800 Subject: [PATCH 3/8] Update to-be-recorded phrases --- docs/phrase/phrase_en.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 @@ + + + + + + + + + + From 228f9772d76fa6920e13c1de0ea4ca41befcb3c0 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 6 Mar 2013 18:01:21 -0600 Subject: [PATCH 4/8] dont destroy handle when subs are inside a call's dialog --- src/mod/endpoints/mod_sofia/sofia_presence.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); + } } From 9ccdf30ed27d81e618f00b88f995c8d151ea6bcb Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 6 Mar 2013 18:01:55 -0600 Subject: [PATCH 5/8] sqlite can't handle bi-directional mutexing --- src/mod/endpoints/mod_sofia/mod_sofia.c | 4 ++-- src/mod/endpoints/mod_sofia/sofia_glue.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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; From b82009c1c2e38b6eb7e8f607eea484fac67c1d9c Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 6 Mar 2013 18:02:44 -0600 Subject: [PATCH 6/8] bump --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 6280508a28..0c4dbcf2f7 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,10 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.3.16b], bugs@freeswitch.org) +AC_INIT([freeswitch], [1.3.16], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [3]) -AC_SUBST(SWITCH_VERSION_MICRO, [16b]) +AC_SUBST(SWITCH_VERSION_MICRO, [16]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, []) From 3be31405f4e549f51ad512ad73b7eb63e82d3073 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 6 Mar 2013 18:03:44 -0600 Subject: [PATCH 7/8] bump --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 0c4dbcf2f7..93ab46d240 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,10 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.3.16], bugs@freeswitch.org) +AC_INIT([freeswitch], [1.3.17], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [3]) -AC_SUBST(SWITCH_VERSION_MICRO, [16]) +AC_SUBST(SWITCH_VERSION_MICRO, [17]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, []) From 1a1153e04a9a343f93894f149f964b410ce9b4ff Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Wed, 6 Mar 2013 23:36:15 -0600 Subject: [PATCH 8/8] FS-5147 --resolve --- src/fs_encode.c | 1 - 1 file changed, 1 deletion(-) 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; } }