aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2006-09-12importing files for 1.2.12.1-netsec releasev1.2.12.1-netseckpfleming3-0/+3352
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.2.12.1-netsec@42821 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-12Creating tag for the release of asterisk-1.2.12.1-netseckpfleming0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.2.12.1-netsec@42820 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-11automerge commitroot2-9/+27
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42787 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-11automerge commitroot15-37/+37
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42736 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-11automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42714 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-09automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42620 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-09automerge commitroot1-6/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42554 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-08automerge commitroot1-0/+23
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42470 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-08automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42440 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-08automerge commitroot1-9/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42419 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-08automerge commitroot1-1/+29
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42372 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-07automerge commitroot1-3/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42282 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-07automerge commitroot1-63/+69
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42207 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-06automerge commitroot2-2/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42169 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-06automerge commitroot1-2/+15
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42147 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-06automerge commitroot1-3/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42132 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-06automerge commitroot1-12/+18
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42107 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-05Merged revisions 41768,41827,41830,41880,41882,41989,42014,42054 via ↵file7-99/+137
svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r41768 | file | 2006-09-01 18:49:07 -0400 (Fri, 01 Sep 2006) | 2 lines Only wipe the redirected audio & video IP/port if it's specified, and trigger a reinvite. ........ r41827 | bweschke | 2006-09-03 10:16:08 -0400 (Sun, 03 Sep 2006) | 3 lines Setting a retry of 0 is generally not a good idea and shouldn't be allowed. (#7574 - reported by regin) ........ r41830 | bweschke | 2006-09-03 10:50:59 -0400 (Sun, 03 Sep 2006) | 3 lines Let's NOT spy on Zap/psuedo channels, mmmmmmmmk? ........ r41880 | bweschke | 2006-09-03 13:13:38 -0400 (Sun, 03 Sep 2006) | 3 lines Don't keep trying the same member in certain strategies when members of the queue are unavailable (#7278 - diLLec reported and patched) - This should have been patched here first and then merged into /trunk. My bad! ........ r41882 | bweschke | 2006-09-03 13:38:22 -0400 (Sun, 03 Sep 2006) | 3 lines Make sure the forwarded channel inherits variables appropriately when we receive a call forward in the queue. (#7867 - raarts reported and patched) ........ r41989 | oej | 2006-09-04 11:46:07 -0400 (Mon, 04 Sep 2006) | 2 lines Don't kill the pvt before we have sent ACK on CANCEL (needs more testing before making a release) ........ r42014 | qwell | 2006-09-05 12:27:46 -0400 (Tue, 05 Sep 2006) | 4 lines Small typo in zapata.conf.sample Reported by ppyy in 7881 ........ r42054 | file | 2006-09-05 16:02:48 -0400 (Tue, 05 Sep 2006) | 2 lines Merge in last round of spy fixes. This should hopefully eliminate all the issues people have been seeing by distinctly separating what each component (core/spy) is responsible for. Core is responsible for adding a spy to a channel, feeding frames to the spy, removing the spy from a channel, and telling the spy to stop. Spy is responsible for reading frames in, and cleaning up after itself. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42081 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-01automerge cancelroot0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41787 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-01automerge commitroot3-9/+19
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41734 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-01automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41714 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-30automerge commitroot9-33/+21
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41432 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-30automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41410 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-30automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41356 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-30automerge commitroot1-26/+22
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41301 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-29automerge commitroot1-6/+19
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41266 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-28automerge commitroot2-25/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41258 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-25automerge commitroot2-3/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41085 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-24automerge commitroot3-5/+20
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41003 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-24automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40987 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-24automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40978 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-23automerge commitroot1-4/+5
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40920 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-22automerge commitroot1-3/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40825 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-21automerge commitroot1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40806 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-20automerge commitroot1-33/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40720 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-20automerge commitroot1-22/+18
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40629 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-19automerge commitroot2-12/+22
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40451 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-18automerge commitroot1-1/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40423 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-17automerge commitroot17-6584/+5614
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40332 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-17automerge commitroot3-6/+17
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40253 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-16automerge commitroot1-4/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40083 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-15automerge commitroot2-9/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39962 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-08automerge commitroot1-0/+33
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39397 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-08automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39377 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-07automerge commitroot1-10/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39104 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-07automerge commitroot1-2/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39080 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-05automerge commitroot2-3/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38995 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-05automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38971 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-05automerge commitroot1-1/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38949 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-05automerge commitroot11-31/+95
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38927 f38db490-d61c-443f-a65b-d21fe96a405b