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/trunk@220289 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_disa.c b/apps/app_disa.c
index e87ee83..49c7ad5 100644 (file)
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -187,12 +187,7 @@ static int disa_exec(struct ast_channel *chan, const char *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 612cf68..45fcfb5 100644 (file)
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -452,10 +452,7 @@ static int playback_exec(struct ast_channel *chan, const char *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 9b349da..0cbaff3 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -9126,8 +9126,6 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *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) {