d2cbfe3d21
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
b45cbc48f2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
213c6afa9b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
50841b3a96
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
029b67fd32
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
41c63cf7f5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
e1fbeb0c7f
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44230 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
e609b4070c
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
1db6355b21
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
b628bed1c3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
d81ec738b2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
b2d3f68e87
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
ae1a27ae61
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
93efe68235
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
3da0f0e59d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
2b76e9e216
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
854e0369df
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
97834bbed9
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
7502860910
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
4c6fb3dd37
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
1de86fd7fc
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
d4026a11b1
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
c5056e1736
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
bb63a367e3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
24279ed40d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
e2354a5244
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
9ae33412c5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
daeb228bb3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
8911aced89
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
1e4fd6f9b5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
60b84e7a31
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
0d4e8df3d6
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
0eb84ea1b0
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
3f4ef02de2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
cb1e08addc
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
e1f5e8e583
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
a270e65e11
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
b2b2ea5901
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
558c7ade17
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
380d8d80ba
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
1134ad9412
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
0b7de19b00
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
6f41dcb8a3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
67f0bd0d79
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
fe6193c75b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
8bb17660d7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
cfb503c6a7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
a4beaa7dc7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
942974c8df
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
6480d28862
Merged revisions 41768,41827,41830,41880,41882,41989,42014,42054 via 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: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
20 years ago
Automerge script
Joshua Colp