Mark Michelson 40983811df Merged revisions 159437 via svnmerge from ...

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

........
r159437 | mmichelson | 2008-11-26 08:58:17 -0600 (Wed, 26 Nov 2008) | 10 lines

Don't allow for configuration options to overwrite options
set via channel variables on a reload.

(closes issue #13921)
Reported by: davidw
Patches:
      13921.patch uploaded by putnopvut (license 60)
Tested by: davidw


........


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

2008-11-26 14:59:09 +00:00

..

h323

Swap "static" and "const", so that "static" appears at the beginning of each

2008-07-14 15:44:07 +00:00

misdn

Merged revisions 157974 via svnmerge from

2008-11-20 00:10:33 +00:00

xpmr

Merged revisions 159050 via svnmerge from

2008-11-25 05:05:18 +00:00

chan_agent.c

Merged revisions 159437 via svnmerge from

2008-11-26 14:59:09 +00:00

chan_alsa.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_console.c

Merged revisions 157039 via svnmerge from

2008-11-15 04:09:13 +00:00

chan_dahdi.c

Merged revisions 155324 via svnmerge from

2008-11-07 20:19:25 +00:00

chan_features.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_gtalk.c

Janitor patch to change uses of sizeof to ARRAY_LEN

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

chan_h323.c

Merged revisions 154264 via svnmerge from

2008-11-04 19:02:21 +00:00

chan_iax2.c

Merged revisions 159360 via svnmerge from

2008-11-25 23:27:08 +00:00

chan_jingle.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_local.c

Merged revisions 157306 via svnmerge from

2008-11-18 18:32:54 +00:00

chan_mgcp.c

Merged revisions 152442 via svnmerge from

2008-10-28 21:40:06 +00:00

chan_misdn.c

Merged revisions 154268 via svnmerge from

2008-11-04 19:09:15 +00:00

chan_nbs.c

one more place I forgot

2008-05-22 17:50:40 +00:00

chan_oss.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

chan_phone.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_phone.h

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_sip.c

Merged revisions 158265-158266 via svnmerge from

2008-11-21 01:23:45 +00:00

chan_skinny.c

Merged revisions 158694 via svnmerge from

2008-11-22 17:00:49 +00:00

chan_unistim.c

More RSW merges. This should do it for the channels/ dir.

2008-08-09 14:12:34 +00:00

chan_usbradio.c

Merged revisions 159050 via svnmerge from

2008-11-25 05:05:18 +00:00

chan_vpb.cc

Fix trunk breakage

2008-05-22 21:27:00 +00:00

console_board.c

import the recent additions for video console into trunk,

2008-06-29 21:17:14 +00:00

console_gui.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

iax2-parser.c

Merged revisions 143031 via svnmerge from

2008-09-13 13:58:15 +00:00

iax2-parser.h

Improve native transfers when a chain of IAX2 connections are in use.

2008-05-17 19:39:35 +00:00

iax2-provision.c

Janitor project to convert sizeof to ARRAY_LEN macro.

2008-07-08 16:40:28 +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

Merge changes from team/bbryant/keyrotation

2008-08-01 18:16:24 +00:00

Makefile

Bring all app_rpt and chan_usbradio stuff up to date

2008-05-16 00:51:14 +00:00

misdn_config.c

Merged revisions 136241 via svnmerge from

2008-08-07 19:01:03 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

2008-07-14 16:50:54 +00:00