summaryrefslogtreecommitdiff
path: root/funcs/func_uri.c
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2011-01-24 17:21:12 +0000
committerJason Parker <jparker@digium.com>2011-01-24 17:21:12 +0000
commit54f6c31a27319d768da73afa966423e1083bb486 (patch)
tree5a5dedd5065b3ab2b3ba6609da56053b4bf66c2d /funcs/func_uri.c
parent1c6bb4c494e7e901838a3b2bb00536ffd0e1e170 (diff)
Merged revisions 303467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r303467 | qwell | 2011-01-24 11:20:03 -0600 (Mon, 24 Jan 2011) | 22 lines Merged revisions 303285 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r303285 | qwell | 2011-01-21 15:48:09 -0600 (Fri, 21 Jan 2011) | 15 lines Merged revisions 303284 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r303284 | qwell | 2011-01-21 15:45:34 -0600 (Fri, 21 Jan 2011) | 8 lines Reset configuration before parsing users.conf. Some values configured in chan_dahdi.conf were able to leak in to users.conf configuration. This was surprising users, and potentially setting non-sane "defaults". ASTNOW-125 ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_uri.c')
0 files changed, 0 insertions, 0 deletions