kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of fs-git:freeswitch

This commit is contained in:
Raymond Chandler 2013-02-15 14:47:56 -05:00
parent 660fd495fc 1a3a11fa1a
commit 9733740cab
5 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/phrase/phrase_en.xml
View File

@ -624,8 +624,10 @@
<prompt phrase="Nothing." filename="ivr-nothing.wav"/>
<prompt phrase="To skip..." filename="ivr-to_skip.wav"/>
<!-- The following phrases still need to be recorded -->
<prompt phrase="Please hold while we conncet you to a live operator." filename="ivr_connect_live_operator.wav"/>
<prompt phrase="Please hold while we connect you to a live operator." filename="ivr_connect_live_operator.wav"/>
<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="" filename=""/>
</ivr>

2
src/mod/applications/mod_httapi/mod_httapi.c
View File

@ -1607,6 +1607,8 @@ static switch_status_t httapi_sync(client_t *client)
if (client->profile->cookie_file) {
switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIEJAR, client->profile->cookie_file);
switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIEFILE, client->profile->cookie_file);
} else {
switch_curl_easy_setopt(curl_handle, CURLOPT_COOKIE, "");
}
if (client->profile->bind_local) {

8
src/mod/endpoints/mod_skypopen/mod_skypopen.c
View File

@ -2029,7 +2029,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypopen_load)
#endif
running = 1;
load_config(FULL_RELOAD);
if (load_config(FULL_RELOAD) == SWITCH_STATUS_SUCCESS) {
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
skypopen_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
@ -2058,6 +2059,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skypopen_load)
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
}
} else {
running = 0;
switch_sleep(1000000); //1 full second
return SWITCH_STATUS_FALSE;
}
return SWITCH_STATUS_FALSE;
}

2
src/switch_loadable_module.c
View File

@ -316,6 +316,8 @@ static switch_status_t switch_loadable_module_process(char *key, switch_loadable
for (ptr = new_module->module_interface->file_interface; ptr; ptr = ptr->next) {
if (!ptr->interface_name) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to load file interface from %s due to no interface name.\n", key);
} else if (!ptr->extens) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to load file interface from %s due to no file extensions.\n", key);
} else {
int i;
for (i = 0; ptr->extens[i]; i++) {

2
src/switch_rtp.c
View File

@ -384,7 +384,7 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "DTMF payload offset by 4 bytes.\n");
}
if (!(packet[0] || packet[1] || packet[2] || packet[3])) {
if (!(packet[0] || packet[1] || packet[2] || packet[3]) && rtp_session->dtmf_data.in_digit_ts) {
switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed DTMF payload check.\n");
rtp_session->dtmf_data.last_digit = 0;