[asterisk-commits] tilghman: branch 1.6.0 r220290 - in /branches/1.6.0: ./ apps/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Sep 24 14:42:25 2009
New Revision: 220290

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_disa.c
    branches/1.6.0/apps/app_playback.c
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_disa.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_disa.c?view=diff&rev=220290&r1=220289&r2=220290
==============================================================================
--- branches/1.6.0/apps/app_disa.c (original)
+++ branches/1.6.0/apps/app_disa.c Thu Sep 24 14:42:25 2009
@@ -160,12 +160,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;
 
 	ast_debug(1, "Context: %s\n",args.context);
 

Modified: branches/1.6.0/apps/app_playback.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_playback.c?view=diff&rev=220290&r1=220289&r2=220290
==============================================================================
--- branches/1.6.0/apps/app_playback.c (original)
+++ branches/1.6.0/apps/app_playback.c Thu Sep 24 14:42:25 2009
@@ -429,10 +429,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.6.0/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=220290&r1=220289&r2=220290
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Thu Sep 24 14:42:25 2009
@@ -7917,8 +7917,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) {