From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 24 Sep 2009 19:39:41 +0000 (+0000)
Subject: Implicitly sending a progress signal breaks some applications.
X-Git-Tag: 1.4.27-rc2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cf26dcdacd3153eebad1d41e2cdba2ff7638fbb;p=thirdparty%2Fasterisk.git

Implicitly sending a progress signal breaks some applications.
Call Progress() in your dialplan if you explicitly want progress to be sent.
(Reverts change 216430, closes issue #15957)
Reported by: Pavel Troller on the Asterisk-Dev mailing list
http://lists.digium.com/pipermail/asterisk-dev/2009-September/039897.html


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@220288 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_disa.c b/apps/app_disa.c
index 0382740579..3c8bad9d4a 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -176,12 +176,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
 			/* answer */
 			ast_answer(chan);
 		}
-	} else {
-		special_noanswer = 1;
-		if (chan->_state != AST_STATE_UP) {
-			ast_indicate(chan, AST_CONTROL_PROGRESS);
-		}
-	}
+	} else special_noanswer = 1;
 	i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */
 	did_ignore = 0;
 	exten[0] = 0;
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 972435f18c..0b788e23a7 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -421,10 +421,7 @@ static int playback_exec(struct ast_channel *chan, void *data)
 		} else if (!option_noanswer) {
 			/* Otherwise answer unless we're supposed to send this while on-hook */
 			res = ast_answer(chan);
-		} else {
-			ast_indicate(chan, AST_CONTROL_PROGRESS);
 		}
-
 	}
 	if (!res) {
 		char *back = args.filenames;
diff --git a/main/pbx.c b/main/pbx.c
index 78abecfae5..7cf669c1f1 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5710,8 +5710,6 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data)
 		} else if (!ast_test_flag(&flags, BACKGROUND_NOANSWER)) {
 			res = ast_answer(chan);
 		}
-		/* Send progress control frame to start early media */
-		ast_indicate(chan, AST_CONTROL_PROGRESS);
 	}
 
 	if (!res) {