Joshua Colp afc99294fa Merged revisions 56231 via svnmerge from ...

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

................
r56231 | file | 2007-02-22 13:49:39 -0500 (Thu, 22 Feb 2007) | 10 lines

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

........
r56230 | file | 2007-02-22 13:44:24 -0500 (Thu, 22 Feb 2007) | 2 lines

Only change the original or clone channel if it's the channel behind the proxy channel, not if it's just a regular bridged channel.

........

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


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

2007-02-22 18:53:22 +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

stdtime

Merged revisions 51256 via svnmerge from

2007-01-18 21:15:59 +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

Rely on ast_gethostbyname to handle IP addresses, not inet_aton. (issue #9056 reported by pj)

2007-02-16 01:36:18 +00:00

aescrypt.c

merge new_loader_completion branch, including (at least):

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

aeskey.c

merge new_loader_completion branch, including (at least):

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

aesopt.h

merge new_loader_completion branch, including (at least):

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

aestab.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +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

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

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 49237 via svnmerge from

2007-01-02 22:43:36 +00:00

ast_expr2.h

merge new_loader_completion branch, including (at least):

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

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

Merged revisions 49237 via svnmerge from

2007-01-02 22:43:36 +00:00

asterisk.c

Merged revisions 54886 via svnmerge from

2007-02-16 17:26:20 +00:00

astmm.c

Merged revisions 50820 via svnmerge from

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

autoservice.c

Might as well go crazy here too and make the autoservice list read/write.

2007-01-23 00:16:55 +00:00

buildinfo.c

merge new_loader_completion branch, including (at least):

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

callerid.c

Merged revisions 51683 via svnmerge from

2007-01-23 19:11:53 +00:00

cdr.c

New CLI command "Core show settings" to list some core settings

2007-02-14 20:22:20 +00:00

channel.c

Merged revisions 56231 via svnmerge from

2007-02-22 18:53:22 +00:00

chanvars.c

make platforms that use mutexes in stdio.h happy

2006-08-22 23:07:11 +00:00

cli.c

Merged revisions 56008 via svnmerge from

2007-02-22 00:38:46 +00:00

config.c

New CLI command "Core show settings" to list some core settings

2007-02-14 20:22:20 +00:00

cryptostub.c

merge new_loader_completion branch, including (at least):

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

db.c

Add DBDel and DBDelTree manager commands. (issue #8516 reported by dprado)

2007-01-25 22:49:24 +00:00

devicestate.c

This introduces a new dialplan function, DEVSTATE, which allows you to do some

2007-02-13 22:02:20 +00:00

dial.c

Merged revisions 54103 via svnmerge from

2007-02-12 19:18:33 +00:00

dlfcn.c

merge new_loader_completion branch, including (at least):

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

dns.c

Return trunk to a state where it compiles under Darwin. The byte order stuff is ugly, if anyone wants to clean it up... by all means do so.

2007-02-21 01:05:26 +00:00

dnsmgr.c

Merged revisions 49006 via svnmerge from

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

dsp.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

ecdisa.h

merge new_loader_completion branch, including (at least):

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

enum.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

file.c

Merged revisions 52335 via svnmerge from

2007-01-26 23:49:29 +00:00

fixedjitterbuf.c

merge new_loader_completion branch, including (at least):

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

fixedjitterbuf.h

merge new_loader_completion branch, including (at least):

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

frame.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

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

Merged revisions 55634 via svnmerge from

2007-02-20 20:32:13 +00:00

image.c

Convert some more stuff to read/write lists.

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

indications.c

Fix a segfault when using "countries" that don't have a matching zone.

2007-01-07 07:43:52 +00:00

io.c

Make file's new comment doxygenified

2007-02-15 17:13:29 +00:00

jitterbuf.c

Merged revisions 52494,52506 via svnmerge from

2007-01-29 17:03:31 +00:00

loader.c

give embedded modules a helping hand by backing up and restoring their global variables when they are loaded and unloaded

2007-02-22 02:36:00 +00:00

logger.c

Flush out the file pointer. (issue #9115 reported by guthrie)

2007-02-20 23:26:00 +00:00

Makefile

Merged revisions 53464 via svnmerge from

2007-02-07 20:09:58 +00:00

manager.c

Properly handle an error result from a manager action. This could have left the action list permanently locked for reading.

2007-02-16 00:10:17 +00:00

md5.c

merge new_loader_completion branch, including (at least):

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

netsock.c

Merged revisions 44956 via svnmerge from

2006-10-12 18:43:52 +00:00

pbx.c

Merged revisions 53070 via svnmerge from

2007-02-01 19:27:22 +00:00

plc.c

merge new_loader_completion branch, including (at least):

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

poll.c

merge new_loader_completion branch, including (at least):

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

privacy.c

merge new_loader_completion branch, including (at least):

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

rtp.c

Adding Realtime Text support (T.140) to Asterisk

2007-02-16 13:35:44 +00:00

say.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

sched.c

bug #8076 check option_debug before printing to debug channel.

2006-10-03 15:53:07 +00:00

sha1.c

merge new_loader_completion branch, including (at least):

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

slinfactory.c

Merged revisions 43695 via svnmerge from

2006-09-26 20:11:44 +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

Only use alloca.h on OSes that have it.

2006-09-18 21:24:50 +00:00

tdd.c

Doxygen changes

2006-12-15 13:36:34 +00:00

term.c

Merged revisions 49006 via svnmerge from

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

threadstorage.c

use a rwlock-list for the list of TLS objects

2007-01-05 00:12:10 +00:00

translate.c

convert ast_build_str to ast_str_*

2006-12-16 09:46:20 +00:00

udptl.c

Adding some doxygen for udptl.c

2007-01-24 08:56:22 +00:00

ulaw.c

merge new_loader_completion branch, including (at least):

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

utils.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