Blocked revisions 193886 via svnmerge

................
  r193886 | mmichelson | 2009-05-12 13:20:14 -0500 (Tue, 12 May 2009) | 17 lines

  Blocked revisions 193880 via svnmerge

  ........
    r193880 | mmichelson | 2009-05-12 13:18:44 -0500 (Tue, 12 May 2009) | 12 lines

    Set the invitestate to INV_CANCELLED only if we are actually sending a SIP CANCEL.

    The problem was that the hangup code was setting the invitestate too early. The result of
    this was that we would always send a CANCEL request, even if it was not an appropriate
    time to do so (e.g. we have not yet received a provisional response for our INVITE).

    Note that this same fix had been applied to trunk and the 1.6.X branches starting with
    revision 155467. This is why you will see this revision being blocked from those places.

    AST-216
  ........
................

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