[asterisk-commits] kpfleming: branch 1.2-netsec r48469 - in /branches/1.2-netsec: ./ channel.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Dec 14 07:18:15 2006
New Revision: 48469

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48469
Log:
manual update

Modified:
    branches/1.2-netsec/   (props changed)
    branches/1.2-netsec/channel.c

Propchange: branches/1.2-netsec/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec 14 07:18:15 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-48420
+/branches/1.2:1-48420,48434

Modified: branches/1.2-netsec/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2-netsec/channel.c?view=diff&rev=48469&r1=48468&r2=48469
==============================================================================
--- branches/1.2-netsec/channel.c (original)
+++ branches/1.2-netsec/channel.c Thu Dec 14 07:18:15 2006
@@ -39,7 +39,7 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 #ifndef ZT_TIMERPING
-#error "You need newer zaptel!  Please cvs update zaptel"
+#error "You need newer zaptel!  Please svn update zaptel"
 #endif
 #endif
 
@@ -3351,7 +3351,10 @@
 		if (bridge_end.tv_sec) {
 			to = ast_tvdiff_ms(bridge_end, ast_tvnow());
 			if (to <= 0) {
-				res = AST_BRIDGE_COMPLETE;
+				if (config->timelimit)
+					res = AST_BRIDGE_RETRY;
+				else
+ 					res = AST_BRIDGE_COMPLETE;
 				break;
 			}
 		} else