kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,144 Commits 151 Branches 1,613 Tags
2f76122f9a31303e56f17622c59c192e39aaa28f
Commit Graph

553 Commits

Author SHA1 Message Date
Automerge Script
b7765f3783 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@55049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-02-16 23:21:15 +00:00
Kevin P. Fleming
dd0edc0f9c merge up to branch 1.2 and re-enable automerge 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@53671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-02-08 22:48:47 +00:00
Automerge Script
9dbe6ac46e automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-02 10:59:16 +00:00
Kevin P. Fleming
05f6188c69 manual update, since automerge is not running at this time 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-12-12 22:58:49 +00:00
Automerge script
9a6cfc6866 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-31 10:21:42 +00:00
Automerge script
bea7528f5e automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-25 09:02:09 +00:00
Automerge script
225c4931fa automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-17 16:01:39 +00:00
Automerge script
e3a3e8377d automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45279 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-16 20:04:13 +00:00
Automerge script
029b67fd32 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-04 16:05:59 +00:00
Automerge script
d81ec738b2 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-01 16:01: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
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
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
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
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
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
402cef20d8 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-29 08:04:58 +00:00
Automerge script
12ebb1d7b4 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@35364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-21 20:04:35 +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
Automerge script
6b24a23364 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-01 13:05:15 +00:00
Automerge script
a5cfea7f28 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@30270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-25 16:05:31 +00:00
Automerge script
4bcedb93cc automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-24 04:05:45 +00:00
Automerge script
49e844c0e6 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@23206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-28 17:05:06 +00:00
Automerge script
c0bff2ac09 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@17177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-03 21:04:38 +00:00
Automerge script
c116009930 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-30 01:06:54 +00:00
Automerge script
c614f4d869 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-21 19:06:07 +00:00
Automerge script
2b3941fcbf automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-16 18:06:16 +00:00
Automerge script
c0763951ba automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-06 03:04:43 +00:00
Automerge script
d58f08a1a9 automerge commit 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-02-22 18:03:52 +00:00
Kevin P. Fleming
f16619507a updating to current 1.2 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-13 03:52:45 +00:00
Russell Bryant
a5e9fe97c8 revert changes to videosupport to allow per-peer setting, since it isn't quite 
complete and there is not an obvious fix at this point


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-22 20:36:47 +00:00
Tilghman Lesher
894bdd5cda Documenting two keywords that were previously missing 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-08 23:32:08 +00:00
Olle Johansson
ee1e461a57 Documenting the default registerattempts setting as 0, continue hammering the server for ever and ever ;-) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-03 01:24:40 +00:00
Kevin P. Fleming
e14cf31bc9 allow previous context-searching behavior to be used if desired (issue #5899) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-12-02 00:42:40 +00:00
Russell Bryant
d03694df19 add description of the "fromdomain" option (issue #5874) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-30 05:26:26 +00:00
Kevin P. Fleming
a563eab49a remove extraneous svn:executable properties 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-29 18:24:39 +00:00
Russell Bryant
feb9764721 issue #5828 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-23 05:57:10 +00:00
Russell Bryant
8c74501001 issue #5826 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-23 05:49:35 +00:00
Kevin P. Fleming
f7f2b1b033 fix remaining breakage related to chan_modem modules 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-17 04:26:07 +00:00
Josh Roberson
59fe845c6c Finish removing chan_modem* by default. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-16 22:40:43 +00:00
Kevin P. Fleming
734034d824 issue #5689 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-11 00:10:44 +00:00
Kevin P. Fleming
3e4feebbd6 issues #3599 and #4252 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-08 23:19:30 +00:00
Kevin P. Fleming
929d7e6e9b document an undocumented variable 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-03 21:53:44 +00:00
Kevin P. Fleming
986a8ca089 issue #5566 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-01 22:04:14 +00:00
Kevin P. Fleming
cb28ef70bc allow DTMF timeout to be configurable (issue #5160) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-01 00:06:43 +00:00
Kevin P. Fleming
0ac988acaa add experimental mISDN channel driver (issue #4077) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-10-31 22:51:12 +00:00
Mark Spencer
754e28abaf Cleanup language in sip.conf (bug #5543) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-10-29 21:05:34 +00:00