[asterisk-commits] tilghman: branch 1.4 r220288 - in /branches/1.4: apps/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Sep 24 14:39:41 2009
New Revision: 220288

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220288
Log:
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

Modified:
    branches/1.4/apps/app_disa.c
    branches/1.4/apps/app_playback.c
    branches/1.4/main/pbx.c

Modified: branches/1.4/apps/app_disa.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_disa.c?view=diff&rev=220288&r1=220287&r2=220288
==============================================================================
--- branches/1.4/apps/app_disa.c (original)
+++ branches/1.4/apps/app_disa.c Thu Sep 24 14:39:41 2009
@@ -176,12 +176,7 @@
 			/* 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;

Modified: branches/1.4/apps/app_playback.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_playback.c?view=diff&rev=220288&r1=220287&r2=220288
==============================================================================
--- branches/1.4/apps/app_playback.c (original)
+++ branches/1.4/apps/app_playback.c Thu Sep 24 14:39:41 2009
@@ -421,10 +421,7 @@
 		} 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;

Modified: branches/1.4/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/pbx.c?view=diff&rev=220288&r1=220287&r2=220288
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Thu Sep 24 14:39:41 2009
@@ -5710,8 +5710,6 @@
 		} 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) {