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
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
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
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
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
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
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
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
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
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
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
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
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
d8220c853c
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-20 05:04:37 +00:00
Automerge script
3e1daa8f94
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-17 22:04:22 +00:00
Automerge script
e6906d738b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-16 19:04:10 +00:00
Automerge script
e7e8d3d4a2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-08 18:03:57 +00:00
Automerge script
e4c08a03c8
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-07 02:03:39 +00:00
Automerge script
d5061be770
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 08:04:05 +00:00
Automerge script
ee2918d783
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 06:04:09 +00:00
Automerge script
809a32c851
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-02 20:04:16 +00:00
Automerge script
1f18490cdd
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-31 22:03:05 +00:00
Automerge script
0e601bac9b
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-30 00:02:52 +00:00
Automerge script
ac9938f84a
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-28 19:02:55 +00:00
Automerge script
4dc5c42b30
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-27 05:02:49 +00:00
Automerge script
f8bb8d5eab
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-27 02:03:01 +00:00
Automerge script
7211dd853e
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-26 16:03:00 +00:00
Automerge script
6342e0c54a
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-25 20:02:30 +00:00
Automerge script
ebdb3d95b2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19 18:03:16 +00:00
Automerge script
4469bcc1a2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-13 17:02:17 +00:00
Automerge script
afb25c2c40
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 16:02:19 +00:00
Automerge script
94755549d7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 14:02:32 +00:00
Automerge script
9fe475f0df
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-11 20:02:43 +00:00
Automerge script
da8d720b2a
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-06 21:01:31 +00:00
Automerge script
2fb94832b5
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-06 16:04:31 +00:00
Automerge script
aa3c2d5acb
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-05 16:04:30 +00:00
Automerge script
c6e79104a3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-04 15:04:52 +00:00
Automerge script
0fb5b6dcf2
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36863 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03 16:04:11 +00:00
Automerge script
fd757fcf51
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03 05:04:12 +00:00
Automerge script
d7b1425124
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36225 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 20:05:10 +00:00
Automerge script
47b80cf742
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 18:04:18 +00:00
Automerge script
6f9b26b7e3
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:01:40 +00:00
Automerge script
5a25b96143
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@35942 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-25 16:04:25 +00:00
Automerge script
e1583210e7
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@35092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-20 11:05:33 +00:00
Automerge script
0af302cf60
automerge commit
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-18 21:04:55 +00:00
