--- chan_zap.c.org	Mon Oct  9 16:29:51 2006
+++ chan_zap.c	Thu Oct 12 22:03:44 2006
@@ -3637,6 +3637,14 @@
 			res = AST_BRIDGE_COMPLETE;
 			goto return_from_bridge;
 		}
+		if (f->frametype == AST_FRAME_VIDEO ||
+		    f->frametype == AST_FRAME_VOICE) {
+			if (who == c0) {
+				ast_write(c1, f);
+			} else if (who == c1) {
+				ast_write(c0, f);
+			}
+		}
 		if (f->frametype == AST_FRAME_DTMF) {
 			if ((who == c0) && p0->pulsedial) {
 				ast_write(c1, f);
@@ -4785,6 +4793,7 @@
 	/* If it's not us, return NULL immediately */
 	if (ast != p->owner) {
 		ast_log(LOG_WARNING, "We're %s, not %s\n", ast->name, p->owner->name);
+		zt_hangup(ast);
 		f = &p->subs[index].f;
 		return f;
 	}