mod_rayo: Punchblock now supports content-type on input matches

Fix applied to Punchblock here: cef5198e80
This commit is contained in:
Ben Langfeld 2013-06-21 13:46:47 -04:00 committed by Chris Rienzo
parent 1b55a67083
commit 12b293d6aa
2 changed files with 0 additions and 5 deletions

View File

@ -45,7 +45,6 @@
/* these are support punchblock.. undefine once punchblock is fixed */ /* these are support punchblock.. undefine once punchblock is fixed */
#define RAYO_UUID_IN_REF_URI #define RAYO_UUID_IN_REF_URI
#define RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE
struct rayo_actor; struct rayo_actor;
struct rayo_call; struct rayo_call;

View File

@ -169,15 +169,11 @@ static int digit_mask_set_from_digits(int digit_mask, const char *digits)
*/ */
static void send_match_event(struct rayo_component *component, iks *result) static void send_match_event(struct rayo_component *component, iks *result)
{ {
#ifdef RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE
rayo_component_send_complete_with_metadata(RAYO_COMPONENT(component), INPUT_MATCH, result, 0);
#else
iks *event = rayo_component_create_complete_event(RAYO_COMPONENT(component), INPUT_MATCH); iks *event = rayo_component_create_complete_event(RAYO_COMPONENT(component), INPUT_MATCH);
iks *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG); iks *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG);
iks_insert_attrib(match, "content-type", "application/nlsml+xml"); iks_insert_attrib(match, "content-type", "application/nlsml+xml");
iks_insert_cdata(match, iks_string(iks_stack(result), result), 0); iks_insert_cdata(match, iks_string(iks_stack(result), result), 0);
rayo_component_send_complete_event(component, event); rayo_component_send_complete_event(component, event);
#endif
} }
/** /**