From: Mike Jerris <mike@jerris.com>
Date: Tue, 12 Feb 2019 15:33:09 +0000 (+0000)
Subject: Merge pull request #1426 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-10744... 
X-Git-Tag: v1.8.6~1^2~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8acb26e35a5213f4b774385a915db0d70ce395e3;p=thirdparty%2Ffreeswitch.git

Merge pull request #1426 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-10744 to master

* commit '78a0ed5de24cd11616c5c74ab8188a16f2f6f4bb':
  FS-10744 [mod_conference] provide call-id for conference fetch
---

8acb26e35a5213f4b774385a915db0d70ce395e3
diff --cc src/mod/applications/mod_conference/conference_member.c
index 152dfb8aa5,b06385d719..613d1ee208
--- a/src/mod/applications/mod_conference/conference_member.c
+++ b/src/mod/applications/mod_conference/conference_member.c
@@@ -73,9 -73,9 +73,10 @@@ void conference_member_bind_controls(co
  
  	switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS);
  	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Conf-Name", member->conference->name);
 +	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Conf-Profile", member->conference->profile_name);
  	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Action", "request-controls");
  	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Controls", controls);
+ 	switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Fetch-Call-UUID", switch_core_session_get_uuid(member->session));
  
  	if (!(cxml = switch_xml_open_cfg(mod_conference_cf_name, &cfg, params))) {
  		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", mod_conference_cf_name);