aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-26 14:00:48 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-26 14:00:48 +0000
commit60dcf795b0730d3de9f561b12fb273665ea463f5 (patch)
tree6a768a308ce67e407d4582fd66a44401807a6f39 /funcs
parent0a35bdbd378aeb9d25368d9e2e8b905a0759aa8a (diff)
Merged revisions 87120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87120 | tilghman | 2007-10-26 08:54:30 -0500 (Fri, 26 Oct 2007) | 7 lines The addition of autoservice to func_curl additionally made func_curl dependent on the existence of a channel, with no real reason. This should make func_curl once again work without a channel. Reported by jmls. Fixed by tilghman. Closes issue #11090 ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@87121 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r--funcs/func_curl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 514be8bb7..4e7b44e12 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -148,7 +148,8 @@ static int acf_curl_exec(struct ast_channel *chan, const char *cmd, char *info,
AST_STANDARD_APP_ARGS(args, info);
- ast_autoservice_start(chan);
+ if (chan)
+ ast_autoservice_start(chan);
if (!curl_internal(&chunk, args.url, args.postdata)) {
if (chunk.memory) {
@@ -163,7 +164,8 @@ static int acf_curl_exec(struct ast_channel *chan, const char *cmd, char *info,
ast_log(LOG_ERROR, "Cannot allocate curl structure\n");
}
- ast_autoservice_stop(chan);
+ if (chan)
+ ast_autoservice_stop(chan);
return 0;
}