Merged revisions 288345 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Wed, 22 Sep 2010 17:13:05 +0000 (17:13 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 22 Sep 2010 17:13:05 +0000 (17:13 +0000)
commite6382a2dcb294d6f54b563fb2ab3bce937a2c65c
tree8add9b8fce12c4c9b113a9bed91308e0613e80c5
parentcbabf4c6f789c84a2c071e8b2950b0ee5d73dfe4
Merged revisions 288345 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288345 | dvossel | 2010-09-22 11:59:14 -0500 (Wed, 22 Sep 2010) | 16 lines

  Merged revisions 288344 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r288344 | dvossel | 2010-09-22 11:53:28 -0500 (Wed, 22 Sep 2010) | 9 lines

    Merged revisions 288343 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r288343 | dvossel | 2010-09-22 11:49:56 -0500 (Wed, 22 Sep 2010) | 2 lines

      During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup.
    ........
  ................
................

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