diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-15 16:54:07 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-15 16:54:07 +0000 |
| commit | 089b1388cab549cb07f018e06b93a74e06b829ac (patch) | |
| tree | 1c36d37983153a2dc6e63a51d972910889ce5327 /configs | |
| parent | 2151e5fd29b6644fcf73e0f231759bb4df35d099 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@291906 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
0 files changed, 0 insertions, 0 deletions