Jason Parker 84e302bfe0 Merged revisions 104092 via svnmerge from ...

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

........
r104092 | qwell | 2008-02-25 14:49:42 -0600 (Mon, 25 Feb 2008) | 11 lines

Allow the use of #include and #exec in situations where the max include depth was only 1.
Specifically, this fixes using #include and #exec in extconfig.conf.

This was basically caused because the config file itself raises the include level to 1.

I opted not to raise the include limit, because recursion here could cause very bizarre behavior.

Pointed out, and tested by jmls

(closes issue #12064)

........


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

2008-02-25 20:50:57 +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 97350 via svnmerge from

2008-01-09 00:51:59 +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

minimime

more header removal/normalization

2007-11-21 00:23:49 +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 101772 via svnmerge from

2008-02-01 16:01:22 +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

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

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

app.c

Merged revisions 103786 via svnmerge from

2008-02-18 20:53:25 +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

make the output of 'core show settings' a bit nicer.

2008-02-18 19:47:40 +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 90348 via svnmerge from

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

audiohook.c

*mumble*

2008-02-20 03:52:57 +00:00

autoservice.c

Merged revisions 97194 via svnmerge from

2008-01-08 20:56:38 +00:00

buildinfo.c

merge new_loader_completion branch, including (at least):

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

callerid.c

Add support for monitoring MWI on FXO lines.

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

cdr.c

Merge changes from team/mvanbaak/cli-command-audit

2008-02-08 21:26:32 +00:00

channel.c

Make sure to mask out non-audio first as well

2008-02-19 22:35: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

Context tracing for channels

2008-02-18 04:43:33 +00:00

config.c

Merged revisions 104092 via svnmerge from

2008-02-25 20:50:57 +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

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 an API call that steals the answered channel so that a destruction of the dialing structure does not hang it up.

2008-01-25 02:52:10 +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

Merged revisions 100465 via svnmerge from

2008-01-27 22:35:29 +00:00

dsp.c

Largely refactor DSP tone detection routines.

2008-02-20 21:36:46 +00:00

ecdisa.h

merge new_loader_completion branch, including (at least):

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

enum.c

A few more "moremanager" fixes

2007-11-27 21:10:50 +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 102858 via svnmerge from

2008-02-07 20:02:17 +00:00

file.c

Only output a log message saying the format does not exist if it actually does not exist, not if the file itself could not be opened.

2008-02-19 21:38:39 +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

Add a non-invasive API for application level manipulation of T38 on a channel. This uses control frames (so they can even pass across IAX2) to negotiate T38 and provided a way of getting the current status of T38 using queryoption. This should by no means cause any issues and if it does I will take responsibility for it.

2008-02-18 23:47:01 +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

Merge changes from team/group/sip-tcptls

2008-01-18 22:04:33 +00:00

image.c

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

2007-11-21 23:09:02 +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

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

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

loader.c

Add a log message that appears when you try to unload a module that isn't loaded.

2008-02-19 21:54:09 +00:00

logger.c

Just some minor coding style cleanup...

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

Makefile

Merged revisions 100932 via svnmerge from

2008-01-29 17:44:05 +00:00

manager.c

Move Originate to a separate privilege and require the additional System privilege to call out to a subshell.

2008-02-22 22:55:35 +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

Add an API call (ast_async_parseable_goto) which parses a goto string and does an async goto instead of an explicit goto.

2008-02-18 15:47:00 +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

merge new_loader_completion branch, including (at least):

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

privacy.c

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

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

rtp.c

Merged revisions 103780 via svnmerge from

2008-02-18 17:45:48 +00:00

say.c

Change verbosity into debug for Hebrew (and various whitespace fixes)

2008-02-19 00:59:40 +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 101222 via svnmerge from

2008-01-30 15:42:29 +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

tcptls.c

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

2008-02-05 23:00:15 +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

Just some minor coding style cleanup...

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

udptl.c

Merge changes from team/mvanbaak/cli-command-audit

2008-02-08 21:26: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

Just some minor coding style cleanup...

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