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

add timeout <seconds> to mod_curl api call

This commit is contained in:
Anthony Minessale 2014-03-03 22:58:45 +05:00
parent 07399e213f
commit 6ef3f7bde7
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/applications/mod_curl/mod_curl.c
View File

@ -51,7 +51,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_curl_load);
*/ */
SWITCH_MODULE_DEFINITION(mod_curl, mod_curl_load, mod_curl_shutdown, NULL); SWITCH_MODULE_DEFINITION(mod_curl, mod_curl_load, mod_curl_shutdown, NULL);
static char *SYNTAX = "curl url [headers|json|content-type <mime-type>] [get|head|post [post_data]]"; static char *SYNTAX = "curl url [headers|json|content-type <mime-type>|timeout <seconds>] [get|head|post [post_data]]";
#define HTTP_SENDFILE_ACK_EVENT "curl_sendfile::ack" #define HTTP_SENDFILE_ACK_EVENT "curl_sendfile::ack"
#define HTTP_SENDFILE_RESPONSE_SIZE 32768 #define HTTP_SENDFILE_RESPONSE_SIZE 32768
@ -830,6 +830,7 @@ SWITCH_STANDARD_API(curl_function)
int i = 0; int i = 0;
switch_memory_pool_t *pool = NULL; switch_memory_pool_t *pool = NULL;
curl_options_t options = { 0 };
if (zstr(cmd)) { if (zstr(cmd)) {
switch_goto_status(SWITCH_STATUS_SUCCESS, usage); switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
@ -868,10 +869,20 @@ SWITCH_STANDARD_API(curl_function)
if (++i < argc) { if (++i < argc) {
content_type = switch_core_strdup(pool, argv[i]); content_type = switch_core_strdup(pool, argv[i]);
} }
} else if (!strcasecmp("timeout", argv[i])) {
if (++i < argc) {
int tmp = atoi(argv[i]);
if (tmp > 0) {
options.connect_timeout = tmp;
} else {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Invalid timeout!\n");
}
}
} }
} }
http_data = do_lookup_url(pool, url, method, postdata, content_type, NULL); http_data = do_lookup_url(pool, url, method, postdata, content_type, &options);
if (do_json) { if (do_json) {
stream->write_function(stream, "%s", print_json(pool, http_data)); stream->write_function(stream, "%s", print_json(pool, http_data));
} else { } else {