[asterisk-commits] jpeeler: branch 1.6.1 r207000 - /branches/1.6.1/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jul 17 12:04:00 2009
New Revision: 207000

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207000
Log:
Blocked revisions 206998 via svnmerge

........
  r206998 | jpeeler | 2009-07-17 12:02:44 -0500 (Fri, 17 Jul 2009) | 14 lines
  
  Fix segfault in sig_analog when using callwaiting, respect callwaiting options
  
  Sig_analog handles allocating the sub channel for callwaiting, so no longer try
  to do it in chan_dahdi. Modified analog_alloc_sub to only mark the sub as
  allocated upon success of the alloc_sub callback, which was responsible for the
  segfault. Also, the callwaiting and callwaitingcallerid options were being
  unconditionally set to true. Now, the options are properly set from
  chan_dahdi.conf.
  
  (closes issue #15508)
  Reported by: elguero
  Tested by: elguero
........

Modified:
    branches/1.6.1/   (props changed)

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-blocked' - no diff available.