Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

fix for MDXMLINT-7 from Simon P. Ditner . Added config option disable-100-continue to disable the Expect: 100-continue HTTP 1.1 header so that it will work with lighthttpd.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5131 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-05-10 19:11:00 +00:00
parent 3a707a316a
commit 628077871f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/xml_curl.conf.xml
View File

@ -8,6 +8,8 @@
<param name="gateway-url" value="http://www.mydomain.com/test.cgi" bindings="dialplan"/>
<!-- set this to provide authentication credentials to the server -->
<!--<param name="gateway-credentials" value="muser:mypass"/>-->
<!-- set to true to disable Expect: 100-continue lighttpd requires this setting -->
<!--<param name="disable-100-continue" value="true"/>-->
</binding>
</bindings>
</configuration>

13
src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
View File

@ -37,6 +37,7 @@ struct xml_binding {
char *url;
char *bindings;
char *cred;
int disable100continue;
};
typedef struct xml_binding xml_binding_t;
@ -68,6 +69,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
xml_binding_t *binding = (xml_binding_t *) user_data;
char *file_url;
struct curl_slist *slist = NULL;
if (!binding) {
return NULL;
@ -115,6 +117,12 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
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-xml/1.0");
if (binding->disable100continue) {
slist = curl_slist_append(slist,"Expect:");
curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist);
}
curl_easy_perform(curl_handle);
curl_easy_cleanup(curl_handle);
close(config_data.fd);
@ -169,6 +177,7 @@ static switch_status_t do_config(void)
char *url = NULL;
char *bind_cred = NULL;
char *bind_mask = NULL;
int disable100continue = 0;
for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) {
char *var = (char *) switch_xml_attr_soft(param, "name");
@ -180,6 +189,8 @@ static switch_status_t do_config(void)
}
} else if (!strcasecmp(var, "gateway-credentials")) {
bind_cred = val;
} else if (!strcasecmp(var, "disable-100-continue ") && switch_true(val)) {
disable100continue = 1;
}
}
@ -203,6 +214,8 @@ static switch_status_t do_config(void)
binding->cred = strdup(bind_cred);
}
binding->disable100continue = disable100continue;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n",
switch_strlen_zero(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all");
switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding);