aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xchannels/chan_zap.c2
-rwxr-xr-xconfig.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 27d26a6bc..cc0e3eace 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3867,7 +3867,6 @@ struct ast_frame *zt_read(struct ast_channel *ast)
p->subs[index].needanswer = 0;
p->subs[index].f.frametype = AST_FRAME_CONTROL;
p->subs[index].f.subclass = AST_CONTROL_ANSWER;
- ast_setstate(ast, AST_STATE_UP);
ast_mutex_unlock(&p->lock);
return &p->subs[index].f;
}
@@ -4019,7 +4018,6 @@ struct ast_frame *zt_read(struct ast_channel *ast)
of a DTMF digit */
p->subs[index].f.frametype = AST_FRAME_CONTROL;
p->subs[index].f.subclass = AST_CONTROL_ANSWER;
- ast_setstate(ast, AST_STATE_UP);
f = &p->subs[index].f;
} else if (p->callwaitcas) {
if ((f->subclass == 'A') || (f->subclass == 'D')) {
diff --git a/config.c b/config.c
index 41c53b6b6..bc9de3018 100755
--- a/config.c
+++ b/config.c
@@ -3,9 +3,9 @@
*
* Configuration File Parser
*
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2004, Digium, Inc.
*
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
*
* This program is free software, distributed under the terms of
* the GNU General Public License