From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 8 Sep 2011 15:44:44 +0000 (-0500)
Subject: FS-3548 --resolve
X-Git-Tag: v1.2-rc1~51^2~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26039c57c27e0085aadd18a8f6b8a3f1c2cbf3a9;p=thirdparty%2Ffreeswitch.git

FS-3548 --resolve
---

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 007ee221a3..9e263056c9 100644
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -1264,8 +1264,9 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
 		if (timeout < h->timeout) timeout = h->timeout;
 
 		if (use_ent) {
-			stream.write_function(&stream, "{ignore_early_media=true,outbound_redirect_fatal=true,leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s}%s:_:",
-								  h->timeout, h->uuid, node->name, parsed ? parsed : h->originate_string);
+			stream.write_function(&stream, "{ignore_early_media=true,outbound_redirect_fatal=true,leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s}%s%s",
+								  h->timeout, h->uuid, node->name, 
+								  parsed ? parsed : h->originate_string, (i == cbh->rowcount - 1) ? "" : SWITCH_ENT_ORIGINATE_DELIM);
 		} else {
 			stream.write_function(&stream, "[leg_timeout=%d,fifo_outbound_uuid=%s,fifo_name=%s]%s,",
 								  h->timeout, h->uuid, node->name, parsed ? parsed : h->originate_string);
@@ -1278,10 +1279,6 @@ static void *SWITCH_THREAD_FUNC ringall_thread_run(switch_thread_t *thread, void
 
 	originate_string = (char *) stream.data;
 
-	if (originate_string) {
-		end_of(originate_string) = '\0';
-	}
-
 	uuid_list = (char *) stream2.data;
 
 	if (uuid_list) {