Automerge script
93efe68235
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 17:01:35 +00:00
Automerge script
3da0f0e59d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 16:01:36 +00:00
Automerge script
2b76e9e216
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 21:01:34 +00:00
Automerge script
854e0369df
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 20:01:41 +00:00
Automerge script
97834bbed9
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 17:02:12 +00:00
Automerge script
7502860910
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 13:01:41 +00:00
Automerge script
4c6fb3dd37
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-26 21:01:50 +00:00
Automerge script
1de86fd7fc
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-25 22:00:50 +00:00
Automerge script
d4026a11b1
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-24 14:01:51 +00:00
Automerge script
c5056e1736
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-22 22:01:20 +00:00
Automerge script
bb63a367e3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-21 17:01:53 +00:00
Automerge script
24279ed40d
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-20 06:01:11 +00:00
Automerge script
e2354a5244
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 17:01:01 +00:00
Automerge script
9ae33412c5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 13:01:18 +00:00
Automerge script
daeb228bb3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 21:00:57 +00:00
Automerge script
8911aced89
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 16:02:39 +00:00
Automerge script
1e4fd6f9b5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-17 14:02:31 +00:00
Automerge script
60b84e7a31
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16 08:01:02 +00:00
Automerge script
0d4e8df3d6
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16 05:00:50 +00:00
Automerge script
0eb84ea1b0
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-14 23:03:37 +00:00
Automerge script
3f4ef02de2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-13 20:02:40 +00:00
Automerge script
cb1e08addc
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 22:00:50 +00:00
Automerge script
e1f5e8e583
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 17:02:51 +00:00
Automerge script
a270e65e11
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 15:02:39 +00:00
Automerge script
b2b2ea5901
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-09 21:02:51 +00:00
Automerge script
558c7ade17
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-09 13:03:03 +00:00
Automerge script
380d8d80ba
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-08 19:02:43 +00:00
Automerge script
1134ad9412
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-08 17:03:06 +00:00
Automerge script
0b7de19b00
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-08 05:02:32 +00:00
Automerge script
6f41dcb8a3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-08 00:02:42 +00:00
Automerge script
67f0bd0d79
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-07 17:03:13 +00:00
Automerge script
fe6193c75b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-07 03:00:58 +00:00
Automerge script
8bb17660d7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-06 21:03:10 +00:00
Automerge script
cfb503c6a7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-06 19:02:18 +00:00
Automerge script
a4beaa7dc7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-06 18:03:25 +00:00
Automerge script
942974c8df
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-06 16:06:48 +00:00
Joshua Colp
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
2006-09-05 23:48:48 +00:00
Automerge script
e9cce1551a
automerge cancel
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-01 23:03:07 +00:00
Automerge script
aee92d097a
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-01 18:02:51 +00:00
Automerge script
ecfce7b643
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-01 17:03:18 +00:00
Automerge script
aada1f902b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-30 19:03:07 +00:00
Automerge script
008cf36d00
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-30 18:03:00 +00:00
Automerge script
5d95ba629c
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-30 15:03:12 +00:00
Automerge script
37f7d1e3f0
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-30 00:03:06 +00:00
Automerge script
d4b10c9036
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-29 06:00:50 +00:00
Automerge script
a37739a0d9
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-28 21:02:56 +00:00
Automerge script
53a30e84eb
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-25 16:02:33 +00:00
Automerge script
a8350ac22f
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 20:01:23 +00:00
Automerge script
26eba15ec8
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 18:01:06 +00:00
Automerge script
38990b3d2c
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 17:01:04 +00:00
