Merged revisions 291905 via svnmerge from

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

................
  r291905 | twilson | 2010-10-15 09:39:58 -0700 (Fri, 15 Oct 2010) | 14 lines

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

  ........
    r291904 | twilson | 2010-10-15 09:16:57 -0700 (Fri, 15 Oct 2010) | 7 lines

    Don't crash or deadlock on module unload

    We can't hold the lock while pthread_join is called since aji_log_hook will
    attempt to lock from the other therad. We reorder the pthread_join and
    ast_aji_disconnect so that we don't do an SSL_read() while SSL_shutdown is
    running, causing a crash.
  ........
................

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