Commit Graph

6968 Commits

Author SHA1 Message Date
Kevin P. Fleming
cde6cc2cf9 importing files for 1.2.12.1-netsec release
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.12.1-netsec@42821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2.12.1-netsec
2006-09-12 04:36:40 +00:00
Kevin P. Fleming
3cebc70d2d Creating tag for the release of asterisk-1.2.12.1-netsec
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.12.1-netsec@42820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-12 04:32:05 +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
Automerge script
c05bc793fe automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-23 17:06:32 +00:00
Automerge script
65d8d50962 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-22 03:00:53 +00:00
Automerge script
e51b44628a automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 23:01:24 +00:00
Automerge script
672df19a39 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-20 23:04:09 +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
38504cba52 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-19 01:04:07 +00:00
Automerge script
c45aa02c13 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-18 20:04:23 +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
1e38d97c40 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@40253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-17 17:04:18 +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
8c1e784711 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-15 23:04:36 +00:00
Automerge script
02e6c4f9f3 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-08 19:02:51 +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
3cafe77949 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@39080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-07 01:03:45 +00:00
Automerge script
76f5300793 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 09:03:31 +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
e91c55a99d automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 07:03:24 +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