[asterisk-commits] tilghman: branch 1.6.1 r159854 - in /branches/1.6.1: ./ apps/app_readexten.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Nov 29 12:34:12 2008
New Revision: 159854

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

........
  r159853 | tilghman | 2008-11-29 12:33:18 -0600 (Sat, 29 Nov 2008) | 2 lines
  
  Allow the '#' sign to exist within an extension (inspired by issue #13330)
........

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

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

Modified: branches/1.6.1/apps/app_readexten.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_readexten.c?view=diff&rev=159854&r1=159853&r2=159854
==============================================================================
--- branches/1.6.1/apps/app_readexten.c (original)
+++ branches/1.6.1/apps/app_readexten.c Sat Nov 29 12:34:12 2008
@@ -169,12 +169,13 @@
 				else
 					status = "TIMEOUT";
 				break;
-			} else if (res == '#') {
-				break;
 			}
 
 			exten[x] = res;
 			if (!ast_matchmore_extension(chan, arglist.context, exten, 1 /* priority */, chan->cid.cid_num)) {
+				if (!ast_exists_extension(chan, arglist.context, exten, 1, chan->cid.cid_num) && res == '#') {
+					exten[x] = '\0';
+				}
 				break;
 			}
 		}