Merged revisions 260434 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Fri, 30 Apr 2010 22:36:49 +0000 (22:36 +0000)
committerJeff Peeler <jpeeler@digium.com>
Fri, 30 Apr 2010 22:36:49 +0000 (22:36 +0000)
commit6dd80de93da6be77d765cbbf8f419a5e53899440
treecf16dd756f19b46b97cf4f967f3fe0254638baa9
parent00a1a96ff55ff7a9b99955d177cc9ba4d0a20462
Merged revisions 260434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r260434 | jpeeler | 2010-04-30 17:22:46 -0500 (Fri, 30 Apr 2010) | 11 lines

  Ensure channel state is not incorrectly set in the case of a very early answer.

  The needringing bit was being read in dahdi_read after answering thereby
  setting the state to ringing from up. This clears needringing upon answering
  so that is no longer possible.

  (closes issue #17067)
  Reported by: tzafrir
  Patches:
        needringing.diff uploaded by tzafrir (license 46)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@260437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_dahdi.c
channels/sig_analog.c
channels/sig_analog.h