Steve Murphy 11e22239cc Merged revisions 158603 via svnmerge from ...

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

........
r158603 | murf | 2008-11-21 16:14:50 -0700 (Fri, 21 Nov 2008) | 11 lines

In reference to the fix made for 13871, I was
merging the fix into 1.6.0 and realized I missed
the code in the h-exten block, and didn't catch it
because my test case had the h-exten commented out.

So, this corrects the code I missed, as a 
preventative against another crash report.
Tested with the h-exten defined, all is well.



........


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

2008-11-21 23:40:46 +00:00

..

db1-ast

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

editline

Fix memory leak when MALLOC_DEBUG is enabled.

2008-11-10 18:04:30 +00:00

stdtime

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

abstract_jb.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

acl.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +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

Whitespace changes only

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

app.c

Add LISTFILTER dialplan function, along with supporting documentation. See

2008-11-05 21:58:48 +00:00

ast_expr2.c

Merged revisions 144924-144925 via svnmerge from

2008-09-27 15:52:56 +00:00

ast_expr2.fl

Merged revisions 144924-144925 via svnmerge from

2008-09-27 15:52:56 +00:00

ast_expr2.h

(closes issue #12467)

2008-04-21 21:13:02 +00:00

ast_expr2.y

Merged revisions 144924-144925 via svnmerge from

2008-09-27 15:52:56 +00:00

ast_expr2f.c

bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too

2008-11-02 18:52:13 +00:00

asterisk.c

Merged revisions 156164 via svnmerge from

2008-11-12 17:38:20 +00:00

astmm.c

If malloc returns NULL, we need to return NULL immediately or

2008-11-19 00:59:48 +00:00

astobj2.c

Merged revisions 158539 via svnmerge from

2008-11-21 22:12:37 +00:00

audiohook.c

Merged revisions 149204 via svnmerge from

2008-10-14 23:04:44 +00:00

autoservice.c

Merged revisions 138027 via svnmerge from

2008-08-15 15:09:46 +00:00

buildinfo.c

fix a few small things found by using sparse

2008-10-30 16:49:02 +00:00

callerid.c

Cleaned up comment

2008-09-09 17:30:52 +00:00

cdr.c

This commit does two things:

2008-11-12 06:46:04 +00:00

channel.c

In order to move away from nested function use, some changes to the recently introduced

2008-11-09 01:59:59 +00:00

chanvars.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

cli.c

This commit does two things:

2008-11-12 06:46:04 +00:00

config.c

more formatting corrections :: one line for loops and if statements still need {}

2008-11-20 17:53:42 +00:00

cryptostub.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

cygload.c

Doxygen updates, formatting.

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

datastore.c

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

db.c

Several manager changes:

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

devicestate.c

Slightly optimize ast_devstate_str and rename global functions devstate2str and config_text_file_save to have an ast_ prefix

2008-11-04 18:47:20 +00:00

dial.c

* Fixed timeout logic in the dialing API as setting timeouts

2008-10-31 20:05:46 +00:00

dns.c

Fix a bug in SRV lookups where dnsmgr would discard everything but the

2008-07-08 21:00:01 +00:00

dnsmgr.c

fix a few small things found by using sparse

2008-10-30 16:49:02 +00:00

dsp.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

ecdisa.h

merge new_loader_completion branch, including (at least):

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

enum.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

event.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

features.c

Merged revisions 158603 via svnmerge from

2008-11-21 23:40:46 +00:00

file.c

Merged revisions 158072 via svnmerge from

2008-11-20 18:20:00 +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

Merged revisions 135841,135847,135850 via svnmerge from

2008-08-06 00:30:53 +00:00

frame.c

Merged revisions 158072 via svnmerge from

2008-11-20 18:20:00 +00:00

fskmodem_float.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem_int.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem.c

(Step 2 of 2)

2008-07-21 21:00:47 +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

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

http.c

bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too

2008-11-02 18:52:13 +00:00

image.c

Whitespace changes only

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

indications.c

Convert open-coded linked list in indications to the AST_LIST_* macros. This

2008-11-07 16:18:52 +00:00

io.c

Merged revisions 94977 via svnmerge from

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

jitterbuf.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

loader.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

logger.c

Fix checking for CONFIG_STATUS_FILEINVALID so that modules don't crash upon trying to parse an invalid config

2008-11-19 19:25:14 +00:00

Makefile

Move all the XML documentation API from pbx.c to xmldoc.c.

2008-11-10 13:53:23 +00:00

manager.c

Make sure we add the Event header for CoreShowChannels.

2008-11-21 19:40:57 +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

Make OpenBSD compile again

2008-06-19 20:25:37 +00:00

pbx.c

Allow space within an extension, when the space is within a character class.

2008-11-21 23:33:22 +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 140816 via svnmerge from

2008-09-03 13:26:43 +00:00

privacy.c

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

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

rtp.c

This commit does two things:

2008-11-12 06:46:04 +00:00

say.c

That's all, folks. Not going to update the Makefile until res_jabber is

2008-08-10 20:57:25 +00:00

sched.c

Merged revisions 142354 via svnmerge from

2008-09-10 16:41:55 +00:00

sha1.c

more header removal/normalization

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

slinfactory.c

- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause

2008-05-22 16:29:54 +00:00

srv.c

Fix a bug in SRV lookups where dnsmgr would discard everything but the

2008-07-08 21:00:01 +00:00

strcompat.c

Whitespace changes only

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

taskprocessor.c

Fix a few more places where the case insensitive hash should be used since

2008-11-15 04:25:57 +00:00

tcptls.c

cleaup of the TCP/TLS socket API:

2008-10-19 19:11:28 +00:00

tdd.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

term.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

threadstorage.c

Janitor patch to change uses of sizeof to ARRAY_LEN

2008-07-11 18:09:35 +00:00

timing.c

- add get_max_rate timing API call

2008-06-26 15:37:01 +00:00

translate.c

Merged revisions 148611 via svnmerge from

2008-10-14 08:06:45 +00:00

udptl.c

This commit does two things:

2008-11-12 06:46:04 +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

Starting with a change to ensure that ast_verbose() preserves ABI compatibility

2008-11-19 01:02:45 +00:00

xml.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

xmldoc.c

Fix checking for CONFIG_STATUS_FILEINVALID so that modules don't crash upon trying to parse an invalid config

2008-11-19 19:25:14 +00:00