From: Gregory Nietsky <gregory@distrotech.co.za>
Date: Sun, 2 Oct 2011 14:20:35 +0000 (+0000)
Subject: Merged revisions 338904 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1086
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5147c881722b7e35593afbc3b7b39caa493392f;p=thirdparty%2Fasterisk.git

Merged revisions 338904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338904 | irroot | 2011-10-02 16:17:32 +0200 (Sun, 02 Oct 2011) | 8 lines

  Remove T38 Gateway capability when detaching framehook.

  SET(FAXOPT(gateway)=no) does not remove the capability when
  detaching the framehook.

  small patch to fix this problem.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_fax.c b/res/res_fax.c
index e746650e50..49812167c9 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -2843,6 +2843,8 @@ static struct ast_frame *fax_gateway_framehook(struct ast_channel *chan, struct
 			}
 		}
 
+		details->caps &= ~AST_FAX_TECH_GATEWAY;
+
 		ao2_ref(details, -1);
 		return NULL;
 	}