[asterisk-commits] trunk r28970 - in /trunk: ./ apps/app_queue.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri May 19 21:51:53 2006
New Revision: 28970

URL: http://svn.digium.com/view/asterisk?rev=28970&view=rev
Log:
Merged revisions 28968 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r28968 | kpfleming | 2006-05-19 21:35:53 -0500 (Fri, 19 May 2006) | 2 lines

don't allow queue member devices to ring longer than the total queue timeout (issue #6423, reported and patched by bcnit)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=28970&r1=28969&r2=28970&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Fri May 19 21:51:53 2006
@@ -2201,7 +2201,10 @@
 			free(tmp);
 		}
 	}
-	to = (qe->parent->timeout) ? qe->parent->timeout * 1000 : -1;
+	if (qe->expire && (!qe->parent->timeout || (qe->expire - now) <= qe->parent->timeout))
+		to = (qe->expire - now) * 1000;
+	else
+		to = (qe->parent->timeout) ? qe->parent->timeout * 1000 : -1;
 	ring_one(qe, outgoing, &numbusies);
 	ast_mutex_unlock(&qe->parent->lock);
 	if (use_weight)