]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 369580 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Tue, 3 Jul 2012 17:23:10 +0000 (17:23 +0000)
committerAutomerge script <automerge@asterisk.org>
Tue, 3 Jul 2012 17:23:10 +0000 (17:23 +0000)
file:///srv/subversion/repos/asterisk/branches/10

................
  r369580 | twilson | 2012-07-03 12:02:18 -0500 (Tue, 03 Jul 2012) | 11 lines

  More improvements to re-INVITEs timing out after a provisional response

  There is no need to call check_pendings() on a final response to an INVITE
  when destroying the scheduler entry as it will be done later during normal
  processing.

  (issue ASTERISK-19992)
  ........

  Merged revisions 369579 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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

channels/chan_sip.c

index fbe22a13091711711a75120548b4112c2ff33fa3..98dbf19abfa37a7928fa60c00b837c366f4923a8 100644 (file)
@@ -20866,9 +20866,6 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
                p->ongoing_reinvite = 0;
                if (p->reinviteid > -1) {
                        AST_SCHED_DEL_UNREF(sched, p->reinviteid, dialog_unref(p, "unref dialog for reinvite timeout because of a final response"));
-                       /* Since we got a final response to the reinvite, but were relying on the reinvite_timeout
-                        * function to clean up after the reinvite, we need to make sure and call check_pendings */
-                       check_pendings(p);
                }
        }