Steve Murphy cd97d6a687 Merged revisions 70062 via svnmerge from ...

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

................
r70062 | murf | 2007-06-19 12:23:23 -0600 (Tue, 19 Jun 2007) | 9 lines

Merged revisions 70053 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r70053 | murf | 2007-06-19 12:07:59 -0600 (Tue, 19 Jun 2007) | 1 line

This fixes 9246, where channel variables are not available in the 'h' exten, on a 'ZOMBIE' channel. The fix is to consolidate the channel variables during a masquerade, and then copy the merged variables back onto the clone, so the zombie has the same vars that the 'original' has.
........

................


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

2007-06-19 18:31:29 +00:00

..

db1-ast

Merged revisions 53497 via svnmerge from

2007-02-07 23:56:46 +00:00

editline

add -Wundef to the --enable-dev-mode flags, so that mistyped macro names in #if expressions will be caught

2007-02-18 15:03:42 +00:00

minimime

Merged revisions 61070 via svnmerge from

2007-04-09 19:57:21 +00:00

stdtime

Merged revisions 69392 via svnmerge from

2007-06-14 22:09:20 +00:00

abstract_jb.c

Cosmetic changes. Make main source files better conform to coding guidelines and standards. (issue #8679 reported by johann8384)

2007-01-23 00:11:32 +00:00

acl.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

adsistub.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +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

Cosmetic changes. Make main source files better conform to coding guidelines and standards. (issue #8679 reported by johann8384)

2007-01-23 00:11:32 +00:00

app.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

ast_expr2.c

add -Wundef to the --enable-dev-mode flags, so that mistyped macro names in #if expressions will be caught

2007-02-18 15:03:42 +00:00

ast_expr2.fl

Merged revisions 59206 via svnmerge from

2007-03-26 17:56:26 +00:00

ast_expr2.h

…

ast_expr2.y

Jason is having problems with the inclusion of <err.h>; it appears to be unnecessary for sucessful builds, so I either removed or commented out the inclusions from all the AEL related code. New outputs from bison/flex are included, etc.

2006-12-28 17:56:21 +00:00

ast_expr2f.c

Change javadoc style code documentation to the same format we use elsewhere.

2007-06-04 15:56:13 +00:00

asterisk.c

Few more rwlist conversions... why not.

2007-06-18 16:37:14 +00:00

astmm.c

Merged revisions 50820 via svnmerge from

2007-01-14 22:00:51 +00:00

autoservice.c

Even more minor code cleanup!

2007-06-12 14:16:37 +00:00

buildinfo.c

…

callerid.c

Merged revisions 69805 via svnmerge from

2007-06-18 21:58:37 +00:00

cdr.c

Few more rwlist conversions... why not.

2007-06-18 16:37:14 +00:00

channel.c

Merged revisions 70062 via svnmerge from

2007-06-19 18:31:29 +00:00

chanvars.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

cli.c

Convert uses of strdup() to ast_strdup()

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

config.c

Merged revisions 69470 via svnmerge from

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

cryptostub.c

Clean up adsistub file a bit (just spacing) and change over the crypto sub to use this build_stub macro strategy.

2007-05-20 17:52:00 +00:00

db.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

devicestate.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

dial.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

dlfcn.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

dns.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

dnsmgr.c

Merged revisions 69708 via svnmerge from

2007-06-18 16:56:06 +00:00

dsp.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

ecdisa.h

…

enum.c

Convert uses of strdup() to ast_strdup()

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

event.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

file.c

Convert uses of strdup() to ast_strdup()

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

fixedjitterbuf.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

fixedjitterbuf.h

…

frame.c

Add a massive set of changes for converting to use the ast_debug() macro.

2007-06-14 19:39:12 +00:00

fskmodem.c

Cosmetic changes. Make main source files better conform to coding guidelines and standards. (issue #8679 reported by johann8384)

2007-01-23 00:11:32 +00:00

http.c

Convert uses of strdup() to ast_strdup()

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

image.c

Convert some more stuff to read/write lists.

2007-01-26 22:55:06 +00:00

indications.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

io.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

jitterbuf.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

loader.c

Convert uses of strdup() to ast_strdup()

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

logger.c

Merged revisions 69392 via svnmerge from

2007-06-14 22:09:20 +00:00

Makefile

Add the adsistub file to the Asterisk makefile, fix a stub definition, and no longer make the symbols from res_adsi global since they don't need to be.

2007-05-20 14:48:31 +00:00

manager.c

Merged revisions 69392 via svnmerge from

2007-06-14 22:09:20 +00:00

md5.c

…

netsock.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

pbx.c

Convert uses of strdup() to ast_strdup()

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

plc.c

…

poll.c

…

privacy.c

…

rtp.c

Merged revisions 70003 via svnmerge from

2007-06-19 17:09:20 +00:00

say.c

Merged revisions 69392 via svnmerge from

2007-06-14 22:09:20 +00:00

sched.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

sha1.c

…

slinfactory.c

Minor tweak... drop translation path if one exists when we get an already signed linear frame in. Chances are the stream has then switched to signed linear and we no longer need the path.

2007-05-25 13:26:52 +00:00

srv.c

add -Wundef to the --enable-dev-mode flags, so that mistyped macro names in #if expressions will be caught

2007-02-18 15:03:42 +00:00

strcompat.c

Merged revisions 68192 via svnmerge from

2007-06-07 19:31:05 +00:00

tdd.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

term.c

Merged revisions 49006 via svnmerge from

2006-12-27 22:14:33 +00:00

threadstorage.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

translate.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

udptl.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00

ulaw.c

…

utils.c

Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes

2007-06-06 21:20:11 +00:00