Merged revisions 339298 via svnmerge from
authorJonathan Rose <jrose@digium.com>
Tue, 4 Oct 2011 14:22:11 +0000 (14:22 +0000)
committerJonathan Rose <jrose@digium.com>
Tue, 4 Oct 2011 14:22:11 +0000 (14:22 +0000)
commit635118043dfaa5832bd00f54c6c23a13f18d9e41
tree2db762f441e61d49941a481521f7c678e81e621c
parent8ae342009deed5072c94d1c465cca045b5d4bbc5
Merged revisions 339298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339298 | jrose | 2011-10-04 09:09:50 -0500 (Tue, 04 Oct 2011) | 19 lines

  Merged revisions 339297 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339297 | jrose | 2011-10-04 09:01:05 -0500 (Tue, 04 Oct 2011) | 13 lines

    Reverting revision 333265 due to component connection problems it introduces.

    I'm going to attempt some generic res_jabber cleanup and come up with a new fix for this
    problem, but first it seems prudent to remove this rather broad attempt to fix it and
    instead approach this problem either from the same angle but looking only at canceling
    (or possibly rescheduling) the send when we absolutely know it will cause a segfault
    or, if that can't be easily accomplished, strictly from the devstate side of things.
    Also, I'm pretty sure a lot of the code in res_jabber isn't thread safe.

    (issue ASTERISK-18626)
    (issue ASTERISK-18078)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
res/res_jabber.c