From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Tue, 3 Nov 2009 23:41:27 +0000 (+0000)
Subject: can't go having any serious oversights now can we?
X-Git-Tag: v1.0.6~1522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54e58d5deb3733b5bb05f438e0f6880d72259baf;p=thirdparty%2Ffreeswitch.git

can't go having any serious oversights now can we?

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

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 3dfbe8d6de..73c228ae53 100644
--- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
+++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
@@ -56,6 +56,7 @@ struct xml_binding {
 	switch_hash_t *vars_map;
 	int use_dynamic_url;
 	int auth_scheme;
+	int timeout;
 };
 
 static int keep_files_around = 0;
@@ -234,6 +235,10 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
 		curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);
 		curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0");
 
+		if (binding->timeout) {
+			curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, binding->timeout);
+		}
+
 		if (binding->disable100continue) {
 			slist = curl_slist_append(slist, "Expect:");
 			curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist);
@@ -344,7 +349,7 @@ static switch_status_t do_config(void)
 		char *bind_mask = NULL;
 		char *method = NULL;
 		int disable100continue = 0;
-		int use_dynamic_url = 0;
+		int use_dynamic_url = 0, timeout = 0;
 		uint32_t enable_cacert_check = 0;
 		char *ssl_cert_file = NULL;
 		char *ssl_key_file = NULL;
@@ -390,6 +395,8 @@ static switch_status_t do_config(void)
 				disable100continue = 1;
 			} else if (!strcasecmp(var, "method")) {
 				method = val;
+			} else if (!strcasecmp(var, "timeout")) {
+				timeout = timeout;
 			} else if (!strcasecmp(var, "enable-cacert-check") && switch_true(val)) {
 				enable_cacert_check = 1;
 			} else if (!strcasecmp(var, "ssl-cert-path")) {
@@ -440,7 +447,7 @@ static switch_status_t do_config(void)
 		memset(binding, 0, sizeof(*binding));
 
 		binding->auth_scheme = auth_scheme;
-		
+		binding->timeout = timeout;
 		binding->url = strdup(url);
 		switch_assert(binding->url);