Mark Michelson 3b830da053 Merged revisions 95577 via svnmerge from ...

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

........
r95577 | mmichelson | 2007-12-31 17:43:13 -0600 (Mon, 31 Dec 2007) | 9 lines

Avoiding a potentially bad locking situation. ast_merge_contexts_and_delete writelocks the conlock, then
calls ast_hint_extension, which attempts to readlock the same lock. Recursion with read-write locks is 
dangerous, so the inner lock needs to be removed. I did this by copying the "guts" of ast_hint_extension
into ast_merge_contexts_and_delete (sans the extra lock).

(this change is inspired by the locking problems seen in issue #11080, but I have no idea if this is the
problematic area experienced by the reporters of that issue)


........


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

2007-12-31 23:44:45 +00:00

..

db1-ast

clean up assembler and preprocessor files if they are here too

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

editline

If malloc.h is included in a Solaris build, the compilation breaks.

2007-12-14 15:49:14 +00:00

libresample

Merge changes from team/russell/codec_resample

2007-12-31 21:22:31 +00:00

minimime

more header removal/normalization

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

stdtime

Start untangling header inclusion in a way that does not affect

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

abstract_jb.c

Fix a few log messages.

2007-11-28 15:38:03 +00:00

acl.c

remove some unnecessary includes

2007-11-24 13:48:48 +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

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

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

app.c

Merged revisions 89709 via svnmerge from

2007-11-27 20:21:57 +00:00

ast_expr2.c

closes issue #11045 - each file needs to define ASTERISK_FILE_VERSION, if you are going to set MTX_PROFILE in the compiler flags; the problem was that the fixes were getting made to the generated .c file, and erased the next time someone regenerated that file from the corresponding .y or .flex file. Moral of story: keep your eyes open and make mods to the .y (or flex input file) and re-run bison (or flex) as the Makefile directs for that file, and then check in both. Also, res_config_sqlite was kinda missed, and has the same issue.

2007-10-25 16:21:30 +00:00

ast_expr2.fl

Made expr2 parser 8-bit transparent

2007-11-28 20:33:21 +00:00

ast_expr2.h

Simplify some preprocessor logic by using #elif

2007-10-17 21:16:40 +00:00

ast_expr2.y

closes issue #11045 - each file needs to define ASTERISK_FILE_VERSION, if you are going to set MTX_PROFILE in the compiler flags; the problem was that the fixes were getting made to the generated .c file, and erased the next time someone regenerated that file from the corresponding .y or .flex file. Moral of story: keep your eyes open and make mods to the .y (or flex input file) and re-run bison (or flex) as the Makefile directs for that file, and then check in both. Also, res_config_sqlite was kinda missed, and has the same issue.

2007-10-25 16:21:30 +00:00

ast_expr2f.c

Made expr2 parser 8-bit transparent

2007-11-28 20:33:21 +00:00

asterisk.c

Fix -s socket option, and document it as well.

2007-12-27 23:28:01 +00:00

astmm.c

remove unnecessary (char *) casts for ast_config_AST_* variables.

2007-12-18 09:46:18 +00:00

astobj2.c

Merged revisions 90348 via svnmerge from

2007-11-30 19:34:47 +00:00

audiohook.c

Adding support for the "automixmonitor" dial and queue options.

2007-11-30 21:19:57 +00:00

autoservice.c

Merged revisions 94801 via svnmerge from

2007-12-26 19:09:17 +00:00

buildinfo.c

…

callerid.c

Add support for monitoring MWI on FXO lines.

2007-12-04 19:08:30 +00:00

cdr.c

If duration or billsec are not yet calculated, calculate them on demand.

2007-12-06 23:27:46 +00:00

channel.c

Merged revisions 95024 via svnmerge from

2007-12-27 21:41:22 +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

Add count of total number of calls processed by asterisk during it's lifetime.

2007-12-07 16:11:05 +00:00

config.c

add support for PARSE_DOUBLE, and remove identifiers for

2007-12-19 15:15:03 +00:00

cryptostub.c

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

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

cygload.c

Doxygen updates, formatting.

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

db.c

remove unnecessary (char *) casts for ast_config_AST_* variables.

2007-12-18 09:46:18 +00:00

devicestate.c

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

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

dial.c

AST_LIST_REMOVE_CURRENT only takes one argument in trunk

2007-12-21 17:40:44 +00:00

dlfcn.c

Start untangling header inclusion in a way that does not affect

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

dns.c

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

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

dnsmgr.c

A few more "moremanager" fixes

2007-11-27 21:10:50 +00:00

dsp.c

Merged revisions 91890 via svnmerge from

2007-12-07 23:32:09 +00:00

ecdisa.h

…

enum.c

A few more "moremanager" fixes

2007-11-27 21:10:50 +00:00

event.c

* In unaligned.h, remove some unnecessary casts and mark the arg of the

2007-12-11 16:29:29 +00:00

file.c

Merged revisions 90155 via svnmerge from

2007-11-29 17:50:44 +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

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

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

fskmodem.c

Start untangling header inclusion in a way that does not affect

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

global_datastores.c

Merged revisions 92363 via svnmerge from

2007-12-11 19:52:37 +00:00

hashtab.c

A small fix from snuffy

2007-12-03 23:49:40 +00:00

http.c

remove some unnecessary includes

2007-11-24 13:48:48 +00:00

image.c

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

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

indications.c

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

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

io.c

Merged revisions 94977 via svnmerge from

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

jitterbuf.c

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

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

loader.c

Merged revisions 91366 via svnmerge from

2007-12-06 14:23:12 +00:00

logger.c

Adding support for storing the queue log entries in a realtime backend.

2007-12-26 15:58:17 +00:00

Makefile

Merge changes from team/russell/codec_resample

2007-12-31 21:22:31 +00:00

manager.c

Merged revisions 94824 via svnmerge from

2007-12-27 01:03:16 +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

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

pbx.c

Merged revisions 95577 via svnmerge from

2007-12-31 23:44:45 +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

…

privacy.c

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

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

rtp.c

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +00:00

say.c

Merged revisions 94420 via svnmerge from

2007-12-21 16:10:21 +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

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

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

srv.c

Convert ast_verbose to ast_verb.

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

strcompat.c

Start untangling header inclusion in a way that does not affect

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

tdd.c

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

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

term.c

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

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

threadstorage.c

Merged revisions 91192 via svnmerge from

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

translate.c

Merged revisions 94828-94829 via svnmerge from

2007-12-27 14:52:07 +00:00

udptl.c

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +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

Add a new API function, written at least twice in app_voicemail.c

2007-12-19 17:09:01 +00:00