diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-12 17:26:10 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-12 17:26:10 +0000 |
| commit | b9c441a77fd5e2c8c97d595c24bc95809241ec2e (patch) | |
| tree | 6a9e94d6e5a7a92deb106f60f31139fbae94ee4d /apps/app_cdr.c | |
| parent | e8a21b70a3fc9d15c68f8c77f9e58d523cf07aca (diff) | |
Merged revisions 275682 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r275682 | jpeeler | 2010-07-12 12:21:01 -0500 (Mon, 12 Jul 2010) | 18 lines
Merged revisions 275665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r275665 | jpeeler | 2010-07-12 11:58:39 -0500 (Mon, 12 Jul 2010) | 11 lines
Change ast_write to not stop generator when called from ast_prod.
For SIP channels configured with the progressinband option on, the ringback was
being immediately stopped. This problem was due to ast_prod being moved for a
deadlock fix in 259858. Prodding the channel after setting up the generator
triggered the check in ast_write to stop the generator. The fix here should
write the frame the same as was done before the call to ast_prod was moved.
(closes issue #17372)
Reported by: tech_admin
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275706 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_cdr.c')
0 files changed, 0 insertions, 0 deletions