[asterisk-commits] mmichelson: trunk r434023 - in /trunk: ./ res/parking/parking_applications.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Apr  6 09:51:21 2015
New Revision: 434023

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=434023
Log:
ParkedCall: Don't allow dialplan fallthrough after retrieving parked call.

This is a change to align behavior with that of Asterisk 11 and previous versions.
In those versions, if a parked call were retrieved, and the call ended, the parked
call retriever would be hung up after the ParkedCall application ran. Prior to this
patch, in Asterisk 13, the same situation would result in the parked call retriever
falling through to additional priorities in the extension where the ParkedCall
application was called. With this patch, the behavior between Asterisk 11 and 13
aligns.

ASTERISK-24899 #close
Reported by Malcolm Davenport
Patches:
	ASTERISK-24899.patch uploaded by Mark Michelson(license #5049)
........

Merged revisions 434022 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/parking/parking_applications.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/parking/parking_applications.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/parking/parking_applications.c?view=diff&rev=434023&r1=434022&r2=434023
==============================================================================
--- trunk/res/parking/parking_applications.c (original)
+++ trunk/res/parking/parking_applications.c Mon Apr  6 09:51:21 2015
@@ -647,7 +647,10 @@
 
 	ast_bridge_features_cleanup(&chan_features);
 
-	return 0;
+	/* Return -1 so that call does not continue in the dialplan. This is to make
+	 * behavior consistent with Asterisk versions prior to 12.
+	 */
+	return -1;
 }
 
 struct park_announce_subscription_data {