From: Automerge Script <automerge@asterisk.org>
Date: Tue, 30 Jan 2007 20:13:10 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.15-netsec~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b9632fefbb4178a3c61d7651e49938f579919d;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/channel.c b/channel.c
index 2a22bed3ca..577d0c799d 100644
--- a/channel.c
+++ b/channel.c
@@ -2476,7 +2476,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d
 						state = f->subclass;
 						ast_frfree(f);
 						break;
-					} else if (f->subclass == AST_CONTROL_PROGRESS) {
+					} else if (f->subclass == AST_CONTROL_PROGRESS || f->subclass == AST_CONTROL_PROCEEDING) {
 						/* Ignore */
 					} else if (f->subclass == -1) {
 						/* Ignore -- just stopping indications */