From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 24 Sep 2009 19:42:33 +0000 (+0000)
Subject: Merged revisions 220289 via svnmerge from
X-Git-Tag: 1.6.1.7-rc2~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=698a9ede879736a3b8a95ca5ed940ec1508f0767;p=thirdparty%2Fasterisk.git

Merged revisions 220289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220289 | tilghman | 2009-09-24 14:41:02 -0500 (Thu, 24 Sep 2009) | 13 lines

  Merged revisions 220288 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r220288 | tilghman | 2009-09-24 14:39:41 -0500 (Thu, 24 Sep 2009) | 6 lines

    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.6.1@220291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_disa.c b/apps/app_disa.c
index d93bb1485b..6ced33b1cf 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -160,12 +160,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;
 
 	ast_debug(1, "Context: %s\n",args.context);
 
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 0be2c2e48f..2dc3c5b17e 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -429,10 +429,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 36c745e454..9a01b9acf3 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8238,8 +8238,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) {