make curl follow redirects for a max of 10 levels

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9195 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c
index d8821c7fa12f93e163a67e59c885397f9a4c0a96..6c9ea5f7886f2aa9db05671f570b83b656e518a3 100644 (file)
--- a/src/mod/formats/mod_shout/mod_shout.c
+++ b/src/mod/formats/mod_shout/mod_shout.c
@@ -451,6 +451,8 @@ static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void
 
        curl_handle = curl_easy_init();
        curl_easy_setopt(curl_handle, CURLOPT_URL, context->stream_url);
+       curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
+       curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
        curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, stream_callback);
        curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) context);
        curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "FreeSWITCH(mod_shout)/1.0");

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index cd3b9c15e8b5231ed64acadce370437c02763645..1308643b4d15a46bd30c71105d6f41df54e99ec9 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -2439,6 +2439,8 @@ static JSBool js_fetchurl_hash(JSContext * cx, JSObject * obj, uintN argc, jsval
                        config_data.name = name;
                }
                curl_easy_setopt(curl_handle, CURLOPT_URL, url);
+               curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
+               curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
                curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, hash_callback);
                curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
                curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0");
@@ -2481,6 +2483,8 @@ static JSBool js_fetchurl_file(JSContext * cx, JSObject * obj, uintN argc, jsval
                config_data.name = filename;
                if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) {
                        curl_easy_setopt(curl_handle, CURLOPT_URL, url);
+                       curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
+                       curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
                        curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback);
                        curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
                        curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0");
@@ -2532,6 +2536,8 @@ static JSBool js_fetchurl(JSContext * cx, JSObject * obj, uintN argc, jsval * ar
                }
 
                curl_easy_setopt(curl_handle, CURLOPT_URL, url);
+               curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
+               curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
                curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, fetch_url_callback);
                curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
                curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-js/1.0");

diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
index e918fa79afb1e6f6448a56af8d2ffe4b50c0b642..ba5992754d58ea7b5e26e668e5410ba4eb30c34e 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -165,6 +165,8 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
                }
                curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headers);
                curl_easy_setopt(curl_handle, CURLOPT_POST, 1);
+               curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1);
+               curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10);
                curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, data);
                curl_easy_setopt(curl_handle, CURLOPT_URL, binding->url);
                curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback);