Mark Michelson be02a94138 Merged revisions 113065 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113065 | mmichelson | 2008-04-07 11:08:45 -0500 (Mon, 07 Apr 2008) | 13 lines

This fix prevents a deadlock that was experienced in chan_local. There was
deadlock prevention in place in chan_local, but it would not work in a specific
case because the channel was recursively locked. By unlocking the channel prior
to calling the generator's generate callback in ast_read_generator_actions(), we
prevent the recursive locking, and therefore the deadlock.

(closes issue #12307)
Reported by: callguy
Patches:
      12307.patch uploaded by putnopvut (license 60)
Tested by: callguy


........


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

2008-04-07 16:12:30 +00:00

..

db1-ast

clean up assembler and preprocessor files if they are here too

2007-10-29 22:24:44 +00:00

editline

Merged revisions 107352 via svnmerge from

2008-03-11 11:36:51 +00:00

libresample

Add doxygen documentation to libresample.h while it's still fresh on my mind

2008-01-02 21:49:44 +00:00

stdtime

Merged revisions 103845 via svnmerge from

2008-02-20 18:28:00 +00:00

abstract_jb.c

Doxygen updates

2008-01-22 08:58:46 +00:00

acl.c

Merged revisions 111442 via svnmerge from

2008-03-27 19:26:45 +00:00

adsistub.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

aescrypt.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aeskey.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aesopt.h

…

aestab.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

alaw.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

app.c

Merged revisions 110628 via svnmerge from

2008-03-25 14:39:45 +00:00

ast_expr2.c

Terry found this problem with running the expr2 parser on OSX. Make the #defines come out the same between the parser & lexer.

2008-01-16 01:35:10 +00:00

ast_expr2.fl

Merged revisions 97849 via svnmerge from

2008-01-10 20:45:05 +00:00

ast_expr2.h

Terry found this problem with running the expr2 parser on OSX. Make the #defines come out the same between the parser & lexer.

2008-01-16 01:35:10 +00:00

ast_expr2.y

Terry found this problem with running the expr2 parser on OSX. Make the #defines come out the same between the parser & lexer.

2008-01-16 01:35:10 +00:00

ast_expr2f.c

Fix up some doxygen issues.

2008-02-15 17:29:08 +00:00

asterisk.c

sleep long enough for the zaptel timer error message to display before exit

2008-04-04 00:57:33 +00:00

astmm.c

Get rid of any remaining ast_verbose calls in the code in favor of

2008-02-05 23:00:15 +00:00

astobj2.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

audiohook.c

Merge over ast_audiohook_volume branch. This adds API calls for use by developers to adjust the volume on a channel.

2008-03-21 17:58:59 +00:00

autoservice.c

Merged revisions 110395 via svnmerge from

2008-03-20 23:14:13 +00:00

buildinfo.c

…

callerid.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

cdr.c

Add the "config reload <conffile>" command, which allows you to tell Asterisk

2008-03-26 18:39:06 +00:00

channel.c

Merged revisions 113065 via svnmerge from

2008-04-07 16:12:30 +00:00

chanvars.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

cli.c

Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not

2008-03-18 15:43:34 +00:00

config.c

Simplify new macro, simplify configfile logic, now that list is sorted

2008-03-26 19:58:09 +00:00

cryptostub.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

cygload.c

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

db.c

Several manager changes:

2008-01-10 00:12:35 +00:00

devicestate.c

Merged revisions 96644 via svnmerge from

2008-01-05 02:12:10 +00:00

dial.c

Add missing unlock

2008-03-20 18:01:36 +00:00

dlfcn.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

dns.c

Merged revisions 112138 via svnmerge from

2008-04-01 17:23:19 +00:00

dnsmgr.c

This adds DNS SRV record support to DNS manager. If there is a SRV record for a given domain, the hostname and port listed in the SRV record will be used. If no SRV record exists or a SRV lookup is not attempted, the DNS lookup on the specified domain will be performed as normal. Chan_sip has been modified to take advantage of the new SRV support.

2008-04-01 17:53:08 +00:00

dsp.c

Only try to detect silence when we actually need to, instead of...always.

2008-03-26 19:16:31 +00:00

ecdisa.h

…

enum.c

Add the "config reload <conffile>" command, which allows you to tell Asterisk

2008-03-26 18:39:06 +00:00

event.c

Fix a small logic error in ast_event_iterator_next. The previous logic allowed for the iterator

2008-02-13 00:55:09 +00:00

features.c

Add the "config reload <conffile>" command, which allows you to tell Asterisk

2008-03-26 18:39:06 +00:00

file.c

Use a 32k file buffer on recordings, which increases the efficiency of file recording.

2008-04-03 07:49:05 +00:00

fixedjitterbuf.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

fixedjitterbuf.h

…

frame.c

But we can change the API here.

2008-03-27 00:27:35 +00:00

fskmodem.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

global_datastores.c

Asterisk, when parking can drop rights a caller when a parking timeout occurs. Also, when doing built-in attended transfers, sometimes incorrectly passes rights from the transferrer to the transferee. This patch tries to fixes the parking issue and lays some groundwork for later fixing the transfer issue.

2008-03-01 01:30:37 +00:00

hashtab.c

Make it so you don't have to cast away const in a couple places

2008-03-04 04:47:32 +00:00

http.c

Re-add HTTP post support by moving to res_http_post.c

2008-04-02 15:25:48 +00:00

image.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

indications.c

Just some minor coding style cleanup...

2008-02-11 18:27:47 +00:00

io.c

Merged revisions 94977 via svnmerge from

2007-12-27 20:11:20 +00:00

jitterbuf.c

Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not

2008-03-18 15:43:34 +00:00

loader.c

Add the "config reload <conffile>" command, which allows you to tell Asterisk

2008-03-26 18:39:06 +00:00

logger.c

Add the "config reload <conffile>" command, which allows you to tell Asterisk

2008-03-26 18:39:06 +00:00

Makefile

Merged revisions 112711 via svnmerge from

2008-04-04 00:53:19 +00:00

manager.c

Merged revisions 112468 via svnmerge from

2008-04-02 17:36:49 +00:00

md5.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

netsock.c

Remove astobj.h from some places where it wasn't needed

2008-03-20 17:45:29 +00:00

pbx.c

Bumped across another test set for the new exten pattern matcher, which revealed a problem with the CANMATCH/MATCHMORE modes. Direct matches were getting in the way. Fixed.

2008-04-01 22:45:10 +00:00

plc.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

poll.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

privacy.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

rtp.c

Merged revisions 112209 via svnmerge from

2008-04-01 18:06:13 +00:00

say.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

sched.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

sha1.c

more header removal/normalization

2007-11-21 00:23:49 +00:00

slinfactory.c

Put my slinfactory changes back in.

2008-04-07 14:54:42 +00:00

srv.c

Convert ast_verbose to ast_verb.

2007-12-14 14:48:38 +00:00

strcompat.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

tcptls.c

Rename ast_tcptls_server_instance to session_instance, since this pertains to

2008-03-12 22:13:18 +00:00

tdd.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

term.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

threadstorage.c

Merged revisions 91192 via svnmerge from

2007-12-05 17:49:03 +00:00

translate.c

Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not

2008-03-18 15:43:34 +00:00

udptl.c

Add the "config reload <conffile>" command, which allows you to tell Asterisk

2008-03-26 18:39:06 +00:00

ulaw.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

utils.c

Merged revisions 109838 via svnmerge from

2008-03-19 04:06:31 +00:00