[asterisk-commits] file: branch 1.6.1 r170053 - in /branches/1.6.1: ./ main/pbx.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jan 22 09:16:12 CST 2009
Author: file
Date: Thu Jan 22 09:16:12 2009
New Revision: 170053
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=170053
Log:
Merged revisions 170051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r170051 | file | 2009-01-22 11:14:50 -0400 (Thu, 22 Jan 2009) | 13 lines
Merged revisions 170050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r170050 | file | 2009-01-22 11:13:56 -0400 (Thu, 22 Jan 2009) | 6 lines
Do a string comparison instead of pointer comparison since some people specify the context they are actually in as an argument to get around some funkiness.
(closes issue #14011)
Reported by: dveiga
Patches:
pbx.c.patch uploaded by dveiga (license 665)
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/main/pbx.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=170053&r1=170052&r2=170053
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Thu Jan 22 09:16:12 2009
@@ -8109,7 +8109,7 @@
ast_stopstream(chan);
}
}
- if (args.context != chan->context && res) {
+ if (strcmp(args.context, chan->context) && res) {
snprintf(chan->exten, sizeof(chan->exten), "%c", res);
ast_copy_string(chan->context, args.context, sizeof(chan->context));
chan->priority = 0;
More information about the asterisk-commits
mailing list