From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 14 Dec 2006 13:18:15 +0000 (+0000)
Subject: manual update
X-Git-Tag: 1.2.14-netsec~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32ef26d65282c1b4e4f6f8bb9e327a3bdfdcc009;p=thirdparty%2Fasterisk.git

manual update


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channel.c b/channel.c
index 539b3d9c16..4779bf8d90 100644
--- a/channel.c
+++ b/channel.c
@@ -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 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
 		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