[svn-commits] mmichelson: branch 1.6.1 r149280 - in /branches/1.6.1: ./ apps/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Oct 14 18:58:10 2008
New Revision: 149280

URL: http://svn.digium.com/view/asterisk?view=rev&rev=149280
Log:
Merged revisions 149279 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r149279 | mmichelson | 2008-10-14 18:57:46 -0500 (Tue, 14 Oct 2008) | 7 lines

When specifying an invalid timeout to Dial, take it
to mean that no timeout is desired.

(closes issue #13625)
Reported by: atis


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/CHANGES
    branches/1.6.1/apps/app_dial.c

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

Modified: branches/1.6.1/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/CHANGES?view=diff&rev=149280&r1=149279&r2=149280
==============================================================================
--- branches/1.6.1/CHANGES (original)
+++ branches/1.6.1/CHANGES Tue Oct 14 18:58:10 2008
@@ -109,6 +109,8 @@
    'UNSUPPORTED'.  This change makes SendImage() more consistent with other
    applications.
  * Park has a new option, 's', which silences the announcement of the parking space number.
+ * A non-numeric, zero, or negative timeout specified to Dial() will now be interpreted as
+   invalid input and will be assumed to mean that no timeout is desired.
 
 SIP Changes
 -----------

Modified: branches/1.6.1/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=149280&r1=149279&r2=149280
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Tue Oct 14 18:58:10 2008
@@ -1589,8 +1589,10 @@
 		to = atoi(args.timeout);
 		if (to > 0)
 			to *= 1000;
-		else
-			ast_log(LOG_WARNING, "Invalid timeout specified: '%s'\n", args.timeout);
+		else {
+			ast_log(LOG_WARNING, "Invalid timeout specified: '%s'. Setting timeout to infinite\n", args.timeout);
+			to = -1;
+		}
 	}
 
 	if (!outgoing) {