aboutsummaryrefslogtreecommitdiffstats
path: root/channels
AgeCommit message (Collapse)AuthorFilesLines
2006-10-17automerge commitroot1-23/+59
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45397 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17automerge commitroot1-0/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45350 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17automerge commitroot1-10/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45312 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-16automerge commitroot1-0/+14
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45279 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-13automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45102 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-13automerge commitroot1-0/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45065 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-13automerge commitroot2-5/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@45025 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-13automerge commitroot1-5/+12
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44999 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-12automerge commitroot1-0/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44970 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-10automerge commitroot3-20/+26
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44804 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-05automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44464 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-05automerge commitroot1-3/+5
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44449 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-04automerge commitroot1-3/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44406 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-04automerge commitroot5-26/+90
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44351 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-02automerge commitroot1-1/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44230 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-02automerge commitroot3-88/+170
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44165 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-28automerge commitroot4-11/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43931 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27automerge commitroot3-26/+9
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43773 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-26automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43720 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-24automerge commitroot1-0/+5
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43563 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-20automerge commitroot3-7/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43321 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-19automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43280 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-18automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43229 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-16automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43023 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-14automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42963 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-9/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42419 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 ↵file1-17/+38
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 commitroot1-4/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41734 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-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41356 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-25automerge commitroot1-2/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@41085 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-17automerge commitroot15-6489/+5455
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40332 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-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-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 commitroot10-30/+94
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38927 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-02automerge commitroot1-9/+12
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38754 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-31automerge commitroot1-2/+12
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38631 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-30automerge commitroot1-22/+23
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38520 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-28automerge commitroot1-12/+15
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38438 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-27automerge commitroot1-1/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38346 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-27automerge commitroot1-1/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38307 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-26automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38249 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-25automerge commitroot1-1/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38215 f38db490-d61c-443f-a65b-d21fe96a405b