Tilghman Lesher 80f7c5ba35 Merged revisions 118252 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
r118252 | tilghman | 2008-05-25 11:17:05 -0500 (Sun, 25 May 2008) | 20 lines

Merged revisions 118251 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118251 | tilghman | 2008-05-25 11:02:04 -0500 (Sun, 25 May 2008) | 12 lines

Realtime flag affects construction in multiple ways, so consulting whether
rtcachefriends was set was done too soon (needed to be done inside build_peer,
not just as a flag to build_peer).
Also, fullcontact needed to be reconstructed, because realtime separates the
embedded ';' into multiple fields.
(closes issue #12722)
 Reported by: barthpbx
 Patches: 
       20080525__bug12722.diff.txt uploaded by Corydon76 (license 14)
 Tested by: barthpbx
 (Much of the discussion happened on #asterisk-dev for diagnosing this issue)

........

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


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

2008-05-25 16:20:32 +00:00

..

h323

Merged revisions 117082 via svnmerge from

2008-05-19 15:27:28 +00:00

misdn

Merged revisions 109475 via svnmerge from

2008-03-18 16:26:59 +00:00

xpmr

Allow chan_usbradio to compile again.

2007-10-17 16:09:01 +00:00

chan_agent.c

Merged revisions 116469 via svnmerge from

2008-05-14 21:41:09 +00:00

chan_alsa.c

Merged revisions 115945 via svnmerge from

2008-05-13 20:30:21 +00:00

chan_console.c

Merged revisions 114892 via svnmerge from

2008-04-30 16:41:33 +00:00

chan_features.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_gtalk.c

Merged revisions 118020 via svnmerge from

2008-05-23 11:02:21 +00:00

chan_h323.c

Merged revisions 115519 via svnmerge from

2008-05-07 18:25:08 +00:00

chan_iax2.c

Merged revisions 116979 via svnmerge from

2008-05-19 03:44:51 +00:00

chan_jingle.c

Merged revisions 114709 via svnmerge from

2008-04-28 04:54:13 +00:00

chan_local.c

Merged revisions 116039 via svnmerge from

2008-05-13 21:19:21 +00:00

chan_mgcp.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_misdn.c

Merged revisions 114612 via svnmerge from

2008-04-24 16:48:05 +00:00

chan_nbs.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_oss.c

Merged revisions 108797 via svnmerge from

2008-03-14 20:09:53 +00:00

chan_phone.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_sip.c

Merged revisions 118252 via svnmerge from

2008-05-25 16:20:32 +00:00

chan_skinny.c

Merged revisions 116800 via svnmerge from

2008-05-16 21:35:33 +00:00

chan_unistim.c

Merged revisions 114271 via svnmerge from

2008-04-18 19:36:26 +00:00

chan_usbradio.c

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

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

chan_vpb.cc

Merged revisions 107525 via svnmerge from

2008-03-11 15:39:53 +00:00

chan_zap.c

Merged revisions 118164 via svnmerge from

2008-05-23 21:31:59 +00:00

console_board.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_gui.c

Merged revisions 105841 via svnmerge from

2008-03-06 00:15:02 +00:00

console_video.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_video.h

Two changes:

2008-01-09 18:03:40 +00:00

DialTone.h

Doxygen updates, formatting.

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

iax2-parser.c

Start untangling header inclusion in a way that does not affect

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

iax2-parser.h

Merged revisions 75445 via svnmerge from

2007-07-17 20:49:09 +00:00

iax2-provision.c

Merged revisions 114866 via svnmerge from

2008-04-29 22:55:13 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Merged revisions 114884 via svnmerge from

2008-04-30 14:55:16 +00:00

Makefile

Merged revisions 107715 via svnmerge from

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

misdn_config.c

Merged revisions 100930 via svnmerge from

2008-01-29 17:42:48 +00:00

vcodecs.c

prevent a panic when destroying a channel with no incoming video.

2008-01-01 23:54:40 +00:00

vgrabbers.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00