[svn-commits] russell: branch russell/sla_updates r57143 - in /team/russell/sla_updates: ./...

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Feb 28 13:54:28 2007
New Revision: 57143

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57143
Log:
Merged revisions 57139 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r57139 | murf | 2007-02-28 13:23:05 -0600 (Wed, 28 Feb 2007) | 9 lines

Merged revisions 57118 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r57118 | murf | 2007-02-28 12:12:41 -0700 (Wed, 28 Feb 2007) | 1 line

a small documentation update, to reflect reality in the goto doc strings, as per 9156, Goto does not proceed to next prio if jump fails
........

................

Modified:
    team/russell/sla_updates/   (props changed)
    team/russell/sla_updates/main/pbx.c

Propchange: team/russell/sla_updates/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/russell/sla_updates/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 28 13:54:28 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-57135
+/branches/1.4:1-57142

Modified: team/russell/sla_updates/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/main/pbx.c?view=diff&rev=57143&r1=57142&r2=57143
==============================================================================
--- team/russell/sla_updates/main/pbx.c (original)
+++ team/russell/sla_updates/main/pbx.c Wed Feb 28 13:54:28 2007
@@ -310,8 +310,13 @@
 	"calling channel to continue dialplan execution at the specified priority.\n"
 	"If no specific extension, or extension and context, are specified, then this\n"
 	"application will jump to the specified priority of the current extension.\n"
+	"  At least a priority is required as an argument, or the goto will return a -1,\n"
+	"and the channel and call will be terminated.\n"
 	"  If the attempt to jump to another location in the dialplan is not successful,\n"
-	"then the channel will continue at the next priority of the current extension.\n"
+	"then the execution engine will try to find and execute the code in the 'i' (invalid)\n"
+	"extension in the current context. If that does not exist, it will try to execute the\n"
+	"'h' extension. If either or neither the 'h' or 'i' extensions have been defined, the\n"
+	"channel is hung up, and the execution of instructions on the channel is terminated.\n"
 	},
 
 	{ "GotoIf", pbx_builtin_gotoif,
@@ -322,7 +327,12 @@
 	"'labeliftrue' if the condition is true, or 'labeliffalse' if the condition is\n"
 	"false. The labels are specified with the same syntax as used within the Goto\n"
 	"application.  If the label chosen by the condition is omitted, no jump is\n"
-	"performed, but execution continues with the next priority in the dialplan.\n"
+	"performed, and the execution passes to the next instruction.\n"
+	"If the target location is bogus, and does not exist, the execution engine will try \n"
+	"to find and execute the code in the 'i' (invalid)\n"
+	"extension in the current context. If that does not exist, it will try to execute the\n"
+	"'h' extension. If either or neither the 'h' or 'i' extensions have been defined, the\n"
+	"channel is hung up, and the execution of instructions on the channel is terminated.\n"
 	},
 
 	{ "GotoIfTime", pbx_builtin_gotoiftime,
@@ -330,6 +340,7 @@
 	"  GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[[context|]exten|]priority):\n"
 	"This application will have the calling channel jump to the specified location\n"
 	"in the dialplan if the current time matches the given time specification.\n"
+	"If the target jump location is bogus, the same actions would be taken as for Goto.\n"
 	},
 
 	{ "ExecIfTime", pbx_builtin_execiftime,