sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "func_curl: Add 'followlocation' option to CURLOPT()" into 16

This commit is contained in:
Joshua Colp 2020-01-14 12:35:54 -06:00 committed by Gerrit Code Review
parent 6dc9239367 f69da94fab
commit 874fff8dc0
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/CHANGES-staging/func_curl.txt Normal file
View File

@ -0,0 +1,5 @@
Subject: func_curl
A new option, followlocation, can now be enabled with the CURLOPT()
dialplan function. Setting this will instruct cURL to follow 3xx
redirects, which it does not by default.

11
funcs/func_curl.c
View File

@ -110,6 +110,9 @@
<enum name="dnstimeout">
<para>Number of seconds to wait for DNS to be resolved</para>
</enum>
<enum name="followlocation">
<para>Whether or not to follow HTTP 3xx redirects (boolean)</para>
</enum>
<enum name="ftptext">
<para>For FTP URIs, force a text transfer (boolean)</para>
</enum>
@ -131,7 +134,9 @@
server response</para>
</enum>
<enum name="maxredirs">
<para>Maximum number of redirects to follow</para>
<para>Maximum number of redirects to follow. The default is -1,
which allows for unlimited redirects. This only makes sense when
followlocation is also set.</para>
</enum>
<enum name="proxy">
<para>Hostname or IP address to use as a proxy server</para>
@ -269,6 +274,9 @@ static int parse_curlopt_key(const char *name, CURLoption *key, enum optiontype
} else if (!strcasecmp(name, "proxyuserpwd")) {
*key = CURLOPT_PROXYUSERPWD;
*ot = OT_STRING;
} else if (!strcasecmp(name, "followlocation")) {
*key = CURLOPT_FOLLOWLOCATION;
*ot = OT_BOOLEAN;
} else if (!strcasecmp(name, "maxredirs")) {
*key = CURLOPT_MAXREDIRS;
*ot = OT_INTEGER;
@ -858,6 +866,7 @@ static struct ast_custom_function acf_curlopt = {
" cookie - Send cookie with request [none]\n"
" conntimeout - Number of seconds to wait for connection\n"
" dnstimeout - Number of seconds to wait for DNS response\n"
" followlocation - Follow HTTP 3xx redirects (boolean)\n"
" ftptext - For FTP, force a text transfer (boolean)\n"
" ftptimeout - For FTP, the server response timeout\n"
" header - Retrieve header information (boolean)\n"