Mark Michelson a0d427bd18 Merged revisions 113066 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
r113066 | mmichelson | 2008-04-07 11:12:30 -0500 (Mon, 07 Apr 2008) | 21 lines

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/branches/1.6.0@113067 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-04-07 16:13:23 +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 106843 via svnmerge from

2008-03-12 22:52:07 +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 111443 via svnmerge from

2008-03-27 19:30:42 +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

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

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

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

app.c

Merged revisions 110629 via svnmerge from

2008-03-25 14:42:35 +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

Merged revisions 112653,112656,112714 via svnmerge from

2008-04-04 01:08:31 +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

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

audiohook.c

Merged revisions 108084 via svnmerge from

2008-03-12 18:31:07 +00:00

autoservice.c

Merged revisions 110396 via svnmerge from

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

buildinfo.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

callerid.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

cdr.c

Merged revisions 107019 via svnmerge from

2008-03-10 23:46:02 +00:00

channel.c

Merged revisions 113066 via svnmerge from

2008-04-07 16:13:23 +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

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

config.c

Merged revisions 109942 via svnmerge from

2008-03-19 16:46:12 +00:00

cryptostub.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +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

Merged revisions 110272 via svnmerge from

2008-03-20 18:02:42 +00:00

dlfcn.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

dns.c

Merged revisions 112148 via svnmerge from

2008-04-01 17:25:05 +00:00

dnsmgr.c

Merged revisions 111908-111909 via svnmerge from

2008-03-28 22:52:02 +00:00

dsp.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

ecdisa.h

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

enum.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +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

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

file.c

Merged revisions 110303 via svnmerge from

2008-03-20 20:10:27 +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

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

frame.c

Merged revisions 111285 via svnmerge from

2008-03-27 00:26:58 +00:00

fskmodem.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +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

Merged revisions 112033 via svnmerge from

2008-03-31 20:55:40 +00:00

image.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +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

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

loader.c

Merged revisions 107960 via svnmerge from

2008-03-12 05:47:37 +00:00

logger.c

Merged revisions 109396 via svnmerge from

2008-03-18 15:16:14 +00:00

Makefile

Merged revisions 112712 via svnmerge from

2008-04-04 00:54:22 +00:00

manager.c

Merged revisions 112469 via svnmerge from

2008-04-02 17:37:52 +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

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

pbx.c

Merged revisions 112357 via svnmerge from

2008-04-01 22:48:06 +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

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

privacy.c

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

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

rtp.c

Merged revisions 112210 via svnmerge from

2008-04-01 18:09:01 +00:00

say.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +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

Merged revisions 112126 via svnmerge from

2008-04-01 16:57:16 +00:00

srv.c

Convert ast_verbose to ast_verb.

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

strcompat.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

tcptls.c

Merged revisions 108295 via svnmerge from

2008-03-12 22:50:14 +00:00

tdd.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

term.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

threadstorage.c

Merged revisions 91192 via svnmerge from

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

translate.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

udptl.c

Merged revisions 107373 via svnmerge from

2008-03-11 11:39:32 +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 109839 via svnmerge from

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