[asterisk-commits] mmichelson: branch 1.6.0 r134599 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jul 30 16:06:12 2008
New Revision: 134599

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

................
r134598 | mmichelson | 2008-07-30 16:05:37 -0500 (Wed, 30 Jul 2008) | 15 lines

Merged revisions 134556 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines

Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

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

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=134599&r1=134598&r2=134599
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jul 30 16:06:12 2008
@@ -5696,7 +5696,7 @@
 			/* List Queue Members */
 			mem_iter = ao2_iterator_init(q->members, 0);
 			while ((mem = ao2_iterator_next(&mem_iter))) {
-				if (ast_strlen_zero(memberfilter) || !strcmp(mem->interface, memberfilter)) {
+				if (ast_strlen_zero(memberfilter) || !strcmp(mem->interface, memberfilter) || !strcmp(mem->membername, memberfilter)) {
 					astman_append(s, "Event: QueueMember\r\n"
 						"Queue: %s\r\n"
 						"Name: %s\r\n"