Permalink
Browse files

Merge branch 'master' into v1.2.stable

Conflicts:
	configure.in
  • Loading branch information...
2 parents 73a07e4 + 1a1153e commit 0a2e713593f31a14e79e03d287c42bde5c7cfaef @swk swk committed Mar 7, 2013
View
2 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])
View
10 docs/phrase/phrase_en.xml
@@ -628,6 +628,16 @@
<prompt phrase="Please hold while we connect you to an actual human being." filename="ivr-connect_actual_human_being.wav"/>
<prompt phrase="The system is going down for maintenance." filename="ivr-system_down_for_maintenance.wav"/>
<prompt phrase="The system will be back up in approximately..." filename="ivr-system_back_up_in_approximately.wav"/>
+ <prompt phrase="To grab a cold pop, press..." filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
+ <prompt phrase="" filename=""/>
<prompt phrase="" filename=""/>
</ivr>
View
1 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;
}
}
View
4 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);
View
4 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;
View
4 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);
+ }
}

0 comments on commit 0a2e713

Please sign in to comment.