提交 1bf6dea8 authored 作者: Michael Jerris's avatar Michael Jerris

option to disable 100 continue (MDXMLINT-24), Thanks Shannon.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7473 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 b879a937
...@@ -23,6 +23,9 @@ ...@@ -23,6 +23,9 @@
<!-- encode the post data may be 'true' for url encoding, 'false' for no encoding or 'base64' for base64 encoding --> <!-- encode the post data may be 'true' for url encoding, 'false' for no encoding or 'base64' for base64 encoding -->
<param name="encode" value="true"/> <param name="encode" value="true"/>
<!-- optional: set to true to disable Expect: 100-continue lighttpd requires this setting -->
<!--<param name="disable-100-continue" value="true"/>-->
<!-- optional: full path to the error log dir for failed web posts if not specified its the same as log-dir --> <!-- optional: full path to the error log dir for failed web posts if not specified its the same as log-dir -->
<!-- either an absolute path, a relative path assuming ${prefix}/logs or a blank or omitted value will default to ${prefix}/logs/xml_cdr --> <!-- either an absolute path, a relative path assuming ${prefix}/logs or a blank or omitted value will default to ${prefix}/logs/xml_cdr -->
......
...@@ -45,6 +45,7 @@ static struct { ...@@ -45,6 +45,7 @@ static struct {
uint32_t ignore_cacert_check; uint32_t ignore_cacert_check;
int encode; int encode;
int log_b; int log_b;
int disable100continue;
} globals; } globals;
SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load);
...@@ -121,6 +122,7 @@ static switch_status_t my_on_hangup(switch_core_session_t *session) ...@@ -121,6 +122,7 @@ static switch_status_t my_on_hangup(switch_core_session_t *session)
/* try to post it to the web server */ /* try to post it to the web server */
if (!switch_strlen_zero(globals.url)) { if (!switch_strlen_zero(globals.url)) {
struct curl_slist *headers = NULL; struct curl_slist *headers = NULL;
struct curl_slist *slist = NULL;
curl_handle = curl_easy_init(); curl_handle = curl_easy_init();
if (globals.encode) { if (globals.encode) {
...@@ -158,6 +160,11 @@ static switch_status_t my_on_hangup(switch_core_session_t *session) ...@@ -158,6 +160,11 @@ static switch_status_t my_on_hangup(switch_core_session_t *session)
curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url);
curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0");
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack);
if (globals.disable100continue) {
slist = curl_slist_append(slist, "Expect:");
curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist);
}
if (globals.ignore_cacert_check) { if (globals.ignore_cacert_check) {
curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE);
...@@ -245,6 +252,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load) ...@@ -245,6 +252,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)
memset(&globals,0,sizeof(globals)); memset(&globals,0,sizeof(globals));
globals.log_b = 1; globals.log_b = 1;
globals.disable100continue = 0;
/* parse the config */ /* parse the config */
if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
...@@ -265,6 +273,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load) ...@@ -265,6 +273,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load)
globals.delay = (uint32_t) atoi(val); globals.delay = (uint32_t) atoi(val);
} else if (!strcasecmp(var, "log-b-leg")) { } else if (!strcasecmp(var, "log-b-leg")) {
globals.log_b = switch_true(val); globals.log_b = switch_true(val);
} else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) {
globals.disable100continue = 1;
} else if (!strcasecmp(var, "encode")) { } else if (!strcasecmp(var, "encode")) {
if (!strcasecmp(val, "base64")) { if (!strcasecmp(val, "base64")) {
globals.encode = 2; globals.encode = 2;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论