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 2a22bed3caeeac2b9e4b5c705e7fbf02c2c2f98f..577d0c799d6a426bde3013783ddea351ae09f3bb 100644 (file)
--- 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 */