Blocked revisions 211809 via svnmerge

Blocked revisions 211809 via svnmerge

................
  r211809 | mmichelson | 2009-08-12 13:47:51 -0500 (Wed, 12 Aug 2009) | 15 lines

  Blocked revisions 211807 via svnmerge

  ........
    r211807 | mmichelson | 2009-08-12 13:46:09 -0500 (Wed, 12 Aug 2009) | 10 lines

    Backport fix so that outbound CANCEL requests have same branch as challenged INVITEs.

    There already was code present to be sure that a CANCEL will contain the same branch-id
    as the INVITE it is cancelling. However, for INVITES which are challenged downstream,
    this mechanism did not work properly. Now this is taken care of.

    This is a backport of a fix already present in all 1.6.X branches and in trunk. It also
    fixes ABE-1907.
  ........
................

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