kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11099 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-01-08 17:36:32 +00:00
parent d6290803ac
commit f813ebe087
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_conference/mod_conference.c
View File

@ -3895,7 +3895,7 @@ SWITCH_STANDARD_API(conf_api_main)
{
char *lbuf = NULL;
switch_status_t status = SWITCH_STATUS_SUCCESS;
char *http = NULL;
char *http = NULL, *type = NULL;
int argc;
char *argv[25] = { 0 };
@ -3905,11 +3905,14 @@ SWITCH_STANDARD_API(conf_api_main)
if (stream->param_event) {
http = switch_event_get_header(stream->param_event, "http-host");
type = switch_event_get_header(stream->param_event, "content-type");
}
if (http) {
/* Output must be to a web browser */
stream->write_function(stream, "<pre>\n");
if (type && !strcasecmp(type, "text/html")) {
stream->write_function(stream, "<pre>\n");
}
}
if (!(lbuf = strdup(cmd))) {

7
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
View File

@ -449,7 +449,7 @@ abyss_bool handler_hook(TSession * r)
char *fs_user = NULL, *fs_domain = NULL;
char *path_info = NULL;
abyss_bool ret = TRUE;
int html = 0, text = 0;
int html = 0, text = 0, xml = 0;
stream.data = r;
stream.write_function = http_stream_write;
@ -467,6 +467,9 @@ abyss_bool handler_hook(TSession * r)
} else if ((command = strstr(r->requestInfo.uri, "/txtapi/"))) {
command += 8;
text++;
} else if ((command = strstr(r->requestInfo.uri, "/xmlapi/"))) {
command += 8;
xml++;
} else {
return FALSE;
}
@ -529,6 +532,8 @@ abyss_bool handler_hook(TSession * r)
switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "text/html");
else if (text)
switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "text/plain");
else if (xml)
switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "text/xml");
if (fs_user)
switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "FreeSWITCH-User", fs_user);
if (fs_domain)