aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-04-13Merge changes from 1.6.0 branch and update ChangeLog.v1.6.0.27-rc2lmadsen2-1/+13
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc2@257215 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-13Update .version and ChangeLoglmadsen2-1/+5
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc2@257193 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-13Create 1.6.0.27-rc2 based on 1.6.0.27-rc1lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc2@257186 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Use autotagged externalsv1.6.0.27-rc1lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc1@256169 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Importing files for 1.6.0.27-rc1 release.lmadsen3-0/+57411
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc1@256168 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Creating tag for the release of asterisk-1.6.0.27-rc1lmadsen4-57405/+2
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc1@256165 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Merged revisions 256161 via svnmerge from lmadsen1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r256161 | lmadsen | 2010-04-05 10:14:53 -0500 (Mon, 05 Apr 2010) | 1 line Fix for localchannel.tex to allow PDFs to be generated again. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@256164 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Use autotagged externalslmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc1@256159 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Importing files for 1.6.0.27-rc1 release.lmadsen3-0/+57403
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc1@256158 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-05Creating tag for the release of asterisk-1.6.0.27-rc1lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc1@256157 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-02Merged revisions 256015 via svnmerge from russell1-24/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r256015 | russell | 2010-04-02 18:46:45 -0500 (Fri, 02 Apr 2010) | 16 lines Merged revisions 256014 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r256014 | russell | 2010-04-02 18:45:56 -0500 (Fri, 02 Apr 2010) | 9 lines Resolve a deadlock that occurs due to a pointless call to ast_bridged_channel() (closes issue #16840) Reported by: bzing2 Patches: patch.txt uploaded by bzing2 (license 902) issue_16840.rev1.diff uploaded by russell (license 2) Tested by: bzing2, russell ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@256016 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-02Merged revisions 256010 via svnmerge from russell1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r256010 | russell | 2010-04-02 18:30:58 -0500 (Fri, 02 Apr 2010) | 9 lines Merged revisions 256009 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r256009 | russell | 2010-04-02 18:30:15 -0500 (Fri, 02 Apr 2010) | 2 lines Remove extremely verbose debug message. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@256011 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-02Merged revisions 255952 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r255952 | tilghman | 2010-04-02 15:19:01 -0500 (Fri, 02 Apr 2010) | 8 lines Pass the PID of the Asterisk process, not the PID of the canary. (closes issue #17065) Reported by: globalnetinc Patches: astcanary.patch uploaded by makoto (license 38) Tested by: frawd, globalnetinc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255953 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-01Merged revisions 255796 via svnmerge from tilghman1-5/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r255796 | tilghman | 2010-04-01 13:16:37 -0500 (Thu, 01 Apr 2010) | 7 lines Fix DEBUG_THREADS build on Darwin. (closes issue #16828) Reported by: oej Patches: 20100331__issue16828.diff.txt uploaded by tilghman (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255813 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-31Recorded merge of revisions 255592 via svnmerge from tilghman1-12/+27
https://origsvn.digium.com/svn/asterisk/trunk ................ r255592 | tilghman | 2010-03-31 14:13:02 -0500 (Wed, 31 Mar 2010) | 22 lines Recorded merge of revisions 255591 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r255591 | tilghman | 2010-03-31 14:09:46 -0500 (Wed, 31 Mar 2010) | 15 lines Ensure line terminators in email are consistent. Fixes an issue with certain Mail Transport Agents, where attachments are not interpreted correctly. (closes issue #16557) Reported by: jcovert Patches: 20100308__issue16557__1.4.diff.txt uploaded by tilghman (license 14) 20100308__issue16557__1.6.0.diff.txt uploaded by tilghman (license 14) 20100308__issue16557__trunk.diff.txt uploaded by tilghman (license 14) Tested by: ebroad, zktech Reviewboard: https://reviewboard.asterisk.org/r/544/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255674 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-31Merged revisions 255504 via svnmerge from lmadsen2-3/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r255504 | lmadsen | 2010-03-31 12:48:09 -0500 (Wed, 31 Mar 2010) | 5 lines Add documentation clarifying when 't' and 'T' can be used. (closes issue #17021) Reported by: kovzol Tested by: lmadsen, kovzol, davidw, ebroad ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255507 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-30Merged revisions 255410 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r255410 | russell | 2010-03-30 15:56:26 -0500 (Tue, 30 Mar 2010) | 9 lines Merged revisions 255409 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r255409 | russell | 2010-03-30 15:56:00 -0500 (Tue, 30 Mar 2010) | 2 lines Don't kill Asterisk if the H323 listener does not start. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255411 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-30Merged revisions 255323 via svnmerge from russell1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r255323 | russell | 2010-03-30 11:07:49 -0500 (Tue, 30 Mar 2010) | 9 lines Merged revisions 255322 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r255322 | russell | 2010-03-30 11:06:06 -0500 (Tue, 30 Mar 2010) | 2 lines Don't make Asterisk not start if pbx_dundi fails to initialize. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255324 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-26Merged revisions 255021 via svnmerge from lmadsen1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r255021 | lmadsen | 2010-03-26 14:07:38 -0500 (Fri, 26 Mar 2010) | 8 lines Update confusing documentation for tlsbindaddr. Update some confusing documentation for the tlsbindaddr option in sip.conf.sample. Point at a link instead which has better documentation. (closes issue #17054) Reported by: klaus3000 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255054 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Merged revisions 254802 via svnmerge from qwell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r254802 | qwell | 2010-03-25 15:41:49 -0500 (Thu, 25 Mar 2010) | 9 lines Merged revisions 254800 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254800 | qwell | 2010-03-25 15:41:15 -0500 (Thu, 25 Mar 2010) | 1 line Don't remove local copies of utils in uninstall. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254803 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Merged revisions 254718 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r254718 | russell | 2010-03-25 15:08:40 -0500 (Thu, 25 Mar 2010) | 2 lines chan_usbradio depends on alsa. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254719 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Fix DEBUG_THREADS issue with out-of-tree modules.qwell2-18/+54
Take 2, without ABI breakage this time. Review: https://reviewboard.asterisk.org/r/588/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254716 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Merged revisions 254553 via svnmerge from mmichelson1-7/+176
https://origsvn.digium.com/svn/asterisk/trunk ................ r254553 | mmichelson | 2010-03-25 12:42:36 -0500 (Thu, 25 Mar 2010) | 11 lines Merged revisions 254552 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254552 | mmichelson | 2010-03-25 12:33:35 -0500 (Thu, 25 Mar 2010) | 5 lines Add doxygen for acl.h Review: https://reviewboard.asterisk.org/r/528 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254554 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Undo unnecessary commit. Sean Bright beat me to the punch on this one.mmichelson1-2/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254550 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Fix potential use of uninitialized value.mmichelson1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254549 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Initialize stream to avoid a compilation error.seanbright1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254546 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Fix crashes resulting from reading non-existent RTP streams.mmichelson1-6/+13
Specifically, when using the CHANNEL dialplan function, it was possible to crash Asterisk by trying to get the rtpdest of a stream type that is not in use by the channel. This commit fixes that issue. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254540 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Make safe_asterisk work on dash/sh/bash etc.lmadsen1-2/+2
Merged from the change to trunk via issue #13111. For some reason the changes there were only done on trunk, and thus were available for 1.6.1 and 1.6.2 when they were branched. Because this change is available on both 1.6.1 and 1.6.2, it makes sense to allow it on the 1.6.0 branch as well. (closes issue #17094) Reported by: stuarth Much thanks to Tilghman and Sean Bright for the help on this merge. Merged revisions 135061 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r135061 | mvanbaak | 2008-08-01 07:17:33 -0500 (Fri, 01 Aug 2008) | 8 lines Make safe_asterisk work on dash/sh/bash etc. (closes issue #13111) Reported by: pabelanger Patches: 2008071901_issue13111_safe_asterisk.diff uploaded by mvanbaak (license 7) Tested by: mvanbaak, pabelanger ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254539 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Unblock r135061seanbright0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254538 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Merged revisions 254453 via svnmerge from twilson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r254453 | twilson | 2010-03-25 11:03:51 -0500 (Thu, 25 Mar 2010) | 9 lines Merged revisions 254451 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254451 | twilson | 2010-03-25 10:57:29 -0500 (Thu, 25 Mar 2010) | 2 lines Handle new SRCCHANGE control message here too ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254466 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Recorded merge of revisions 254454 via svnmerge from mmichelson1-14/+36
https://origsvn.digium.com/svn/asterisk/trunk ................ r254454 | mmichelson | 2010-03-25 11:04:48 -0500 (Thu, 25 Mar 2010) | 50 lines Recorded merge of revisions 254452 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254452 | mmichelson | 2010-03-25 10:59:56 -0500 (Thu, 25 Mar 2010) | 44 lines Several fixes regarding RFC2833 DTMF detection. Here is a copy and paste of the details from my request on reviewboard that dealt with these changes: Fix 1. The first change in place is to fix Mantis issue 15811, which deals with a situation where Asterisk will incorrectly interpret out of order RFC2833 frames as duplicate DTMF digits. For instance, we would receive a sequence like: seqno 1: DTMF 1 seqno 2: DTMF 1 seqno 3: DTMF 1 seqno 4: DTMF 1 seqno 6: DTMF 1 (end) seqno 5: DTMF 1 seqno 7: DTMF 1 (end) seqno 8: DTMF 1 (end) Prior to this patch when we received the frame with seqno 5, we would interpret this as a new DTMF 1. With this patch, we will check the seqno of the incoming digit and not process the frame if the seqno is lower than the last recorded seqno. Note that we do not record the seqno of the dropped DTMF frame for future processing. While the above situation is what was designed to be fixed, the patch is written in such a way that the following would also be fixed too: seqno 9: DTMF 1 seqno 10: DTMF 1 (end) seqno 11: DTMF 1 (end) seqno 13: DTMF 2 seqno 12: DTMF 1 (end) seqno 14: DTMF 2 seqno 15: DTMF 2 (end) seqno 16: DTMF 2 (end) seqno 17: DTMF 2 (end) In this second situation, the beginning of the DTMF 2 arrives before the final end frame of the DTMF 1. With the patch, seqno 12 is no processed and thus we properly interpret the DTMF. Fix 2. The second change in place is to fix an issue like the following: seqno 1: DTMF 1 seqno 2: DTMF 1 seqno 3: DTMF 1 (end) *packet lost* seqno 4: DTMF 1 (end) *packet lost* seqno 5: DTMF 1 (end) *packet lost* seqno 6: DTMF 2 When we receive seqno 6, we had code in place that was supposed to properly end the previously unended DTMF 1. The problem was that the code was essentially a no-op. The code would set up an end frame for the DTMF 1 but would immediately overwrite the frame with the begin for DTMF 2. I changed process_dtmf_rfc2833() so that instead of returning a single frame, it is given as an output parameter a list of frames. Each frame that needs to be returned is appended to this list. Fix 3. The final change is a minor one where an AST_CONTROL_SRCCHANGE frame could get lost. If we process a cisco DTMF or an RFC 3389 frame and no frame was returned, then we would return &ast_null_frame. The problem is that earlier in the function, we may have generated an AST_CONTROL_SRCCHANGE frame and put it in the list of frames we wish to return. This frame would be lost in such a case. The patch fixes this problem ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254455 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-25Merged revisions 254446 via svnmerge from lmadsen1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r254446 | lmadsen | 2010-03-25 10:21:26 -0500 (Thu, 25 Mar 2010) | 9 lines handle_speechset has 4 arguments. Update code to reflect that handle_speechset has 4 arguments. (closes issue #17093) Reported by: gpatri Patches: res_agi.patch uploaded by gpatri (license 1014) Tested by: pabelanger, mmichelson ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254449 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-24Merged revisions 254277 via svnmerge from jpeeler1-19/+21
https://origsvn.digium.com/svn/asterisk/trunk ................ r254277 | jpeeler | 2010-03-24 12:15:05 -0500 (Wed, 24 Mar 2010) | 78 lines Merged revisions 254235 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r254235 | jpeeler | 2010-03-23 19:37:23 -0500 (Tue, 23 Mar 2010) | 72 lines Ensure that monitor recordings are written to the correct location (again) This is an extension to 248860. As such the dialplan test has been extended: ; non absolute path, not combined exten => 5040, 1, monitor(wav,tmp/jeff/monitor_test) exten => 5040, n, dial(sip/5001) ; absolute path, not combined exten => 5041, 1, monitor(wav,/tmp/jeff/monitor_test2) exten => 5041, n, dial(sip/5001) ; no path, not combined exten => 5042, 1, monitor(wav,monitor_test3) exten => 5042, n, dial(sip/5001) ; combined: changemonitor from non absolute to no path (leaves tmp/jeff) exten => 5043, 1, monitor(wav,tmp/jeff/monitor_test4,m) exten => 5043, n, changemonitor(monitor_test5) exten => 5043, n, dial(sip/5001) ; combined: changemonitor from no path to non absolute path exten => 5044, 1, monitor(wav,monitor_test6,m) exten => 5044, n, changemonitor(tmp/jeff/monitor_test7) ; this wasn't possible before exten => 5044, n, dial(sip/5001) ; non absolute path, combined exten => 5045, 1, monitor(wav,tmp/jeff/monitor_test8,m) exten => 5045, n, dial(sip/5001) ; absolute path, combined exten => 5046, 1, monitor(wav,/tmp/jeff/monitor_test9,m) exten => 5046, n, dial(sip/5001) ; no path, combined exten => 5047, 1, monitor(wav,monitor_test10,m) exten => 5047, n, dial(sip/5001) ; combined: changemonitor from non absolute to absolute (leaves tmp/jeff) exten => 5048, 1, monitor(wav,tmp/jeff/monitor_test11,m) exten => 5048, n, changemonitor(/tmp/jeff/monitor_test12) exten => 5048, n, dial(sip/5001) ; combined: changemonitor from absolute to non absolute (leaves /tmp/jeff) exten => 5049, 1, monitor(wav,/tmp/jeff/monitor_test13,m) exten => 5049, n, changemonitor(tmp/jeff/monitor_test14) exten => 5049, n, dial(sip/5001) ; combined: changemonitor from no path to absolute exten => 5050, 1, monitor(wav,monitor_test15,m) exten => 5050, n, changemonitor(/tmp/jeff/monitor_test16) exten => 5050, n, dial(sip/5001) ; combined: changemonitor from absolute to no path (leaves /tmp/jeff) exten => 5051, 1, monitor(wav,/tmp/jeff/monitor_test17,m) exten => 5051, n, changemonitor(monitor_test18) exten => 5051, n, dial(sip/5001) ; not combined: changemonitor from non absolute to no path (leaves tmp/jeff) exten => 5052, 1, monitor(wav,tmp/jeff/monitor_test19) exten => 5052, n, changemonitor(monitor_test20) exten => 5052, n, dial(sip/5001) ; not combined: changemonitor from no path to non absolute exten => 5053, 1, monitor(wav,monitor_test21) exten => 5053, n, changemonitor(tmp/jeff/monitor_test22) exten => 5053, n, dial(sip/5001) ; not combined: changemonitor from non absolute to absolute (leaves tmp/jeff) exten => 5054, 1, monitor(wav,tmp/jeff/monitor_test23) exten => 5054, n, changemonitor(/tmp/jeff/monitor_test24) exten => 5054, n, dial(sip/5001) ; not combined: changemonitor from absolute to non absolute (leaves /tmp/jeff) exten => 5055, 1, monitor(wav,/tmp/jeff/monitor_test24) exten => 5055, n, changemonitor(tmp/jeff/monitor_test25) exten => 5055, n, dial(sip/5001) ; not combined: changemonitor from no path to absolute exten => 5056, 1, monitor(wav,monitor_test26) exten => 5056, n, changemonitor(/tmp/jeff/monitor_test27) exten => 5056, n, dial(sip/5001) ; not combined: changemonitor from absolute to no path (leaves /tmp/jeff) exten => 5057, 1, monitor(wav,/tmp/jeff/monitor_test28) exten => 5057, n, changemonitor(monitor_test29) exten => 5057, n, dial(sip/5001) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254278 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-23Merged revisions 254050 via svnmerge from jpeeler1-2/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r254050 | jpeeler | 2010-03-23 16:17:23 -0500 (Tue, 23 Mar 2010) | 14 lines Exit native bridging early for greater timing accuracy with warnings This changes native bridging to break one millisecond early so that the more accurate timeval calculations done in the generic bridge can be performed using the bridge config. Currently the time between exiting native bridging slightly late can sometimes cause a large enough discrepancy for warnings to be missed. For the record, 1.4 does not attempt to native bridge at all when warnings are enabled. (closes issue #15815) Reported by: adomjan Review: https://reviewboard.asterisk.org/r/577/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254061 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-23Merged revisions 254001 via svnmerge from tzafrir1-1/+1
http://svn.digium.com/svn/asterisk/trunk ........ r254001 | tzafrir | 2010-03-23 21:19:52 +0200 (Tue, 23 Mar 2010) | 2 lines Change the name of the category 'TEST' to match the name of the subdir ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@254044 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-22Merged revisions 253800 via svnmerge from mnicholson1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r253800 | mnicholson | 2010-03-22 14:52:52 -0500 (Mon, 22 Mar 2010) | 11 lines Merged revisions 253799 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r253799 | mnicholson | 2010-03-22 14:50:00 -0500 (Mon, 22 Mar 2010) | 4 lines Unconditionally copy the caller's account code to the called party. (related to issue #16331) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253803 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-20Resolve 1.6.0 compilation issues on FreeBSD.russell5-9/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253630 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-20Merged revisions 253536-253538,253540 via svnmerge from russell8-8/+12
https://origsvn.digium.com/svn/asterisk/trunk ........ r253536 | russell | 2010-03-20 06:33:30 -0500 (Sat, 20 Mar 2010) | 4 lines Use SHRT_MAX instead of MAXSHORT. These changes fix build issues I had with this module on FreeBSD. ........ r253537 | russell | 2010-03-20 06:39:39 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve a compiler warning on FreeBSD. ........ r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve compiler warnings on FreeBSD. ........ r253540 | russell | 2010-03-20 07:03:07 -0500 (Sat, 20 Mar 2010) | 2 lines Resolve more compiler warnings on FreeBSD. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253626 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-20Resolve compiler warnings on FreeBSD.russell1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253625 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-18Slightly different fix for UserEvent docs update.lmadsen1-1/+1
(issue #16961) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253348 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-18Merged revisions 253256 via svnmerge from lmadsen1-28/+46
https://origsvn.digium.com/svn/asterisk/trunk ........ r253256 | lmadsen | 2010-03-18 10:46:52 -0500 (Thu, 18 Mar 2010) | 9 lines Update to new Local channel documentation. Add same changes as commit to 1.4, but convert to TeX. (issue #16963) Reported by: kobaz Patches: localchannel-2.txt uploaded by kobaz (license 834) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253259 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-17Revert API change in release branchestwilson6-10/+10
This re-renames ast_rtp_update_source to ast_rtp_new_source git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253158 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-17Merged revisions 253028 via svnmerge from lmadsen1-0/+32
https://origsvn.digium.com/svn/asterisk/trunk ................ r253028 | lmadsen | 2010-03-16 19:29:06 -0500 (Tue, 16 Mar 2010) | 13 lines Merged revisions 253018 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r253018 | lmadsen | 2010-03-16 19:26:19 -0500 (Tue, 16 Mar 2010) | 6 lines Add french snipset to say.conf. Add the french snipset to say.conf. (Closes issue #15799) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@253031 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-16Merged revisions 252976 via svnmerge from tilghman1-6/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r252976 | tilghman | 2010-03-16 18:49:35 -0500 (Tue, 16 Mar 2010) | 8 lines Mask out previous arguments on each nested invocation of Gosub. (closes issue #16758) Reported by: wdoekes Patches: 20100316__issue16758.diff.txt uploaded by tilghman (license 14) Review: https://reviewboard.asterisk.org/r/561/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252979 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-16Merged revisions 252767 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r252767 | russell | 2010-03-16 14:01:04 -0500 (Tue, 16 Mar 2010) | 13 lines Merged revisions 252766 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252766 | russell | 2010-03-16 14:00:43 -0500 (Tue, 16 Mar 2010) | 6 lines Don't treat warnings as errors for muted. muted supports OS X, but uses functions marked as deprecated in 10.6. However, the functions are still supported, so just ignore the warnings for now and allow the build to proceed. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252768 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-16Merged revisions 252762 via svnmerge from lmadsen1-7/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r252762 | lmadsen | 2010-03-16 13:48:22 -0500 (Tue, 16 Mar 2010) | 15 lines Merged revisions 252761 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252761 | lmadsen | 2010-03-16 13:46:20 -0500 (Tue, 16 Mar 2010) | 7 lines Additional extensions.ael global variable fixes. Fixing up a couple more overlapping global variable namespaces shared with extensions.conf.sample. Also noticed a few of the lines that were commented out didn't have the closing semi-colon so I added that as well. (issue #17035) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252765 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-15Merged revisions 252623 via svnmerge from seanbright1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r252623 | seanbright | 2010-03-15 17:55:44 -0400 (Mon, 15 Mar 2010) | 4 lines Resolve a crash in SLATrunk when the specified trunk doesn't exist. Reported by philipp64 in #asterisk-dev. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252624 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-15Merged revisions 252619 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r252619 | tilghman | 2010-03-15 16:51:55 -0500 (Mon, 15 Mar 2010) | 9 lines Merged revisions 252617 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252617 | tilghman | 2010-03-15 16:43:14 -0500 (Mon, 15 Mar 2010) | 2 lines Uh, yeah. Umask. I'm stupid. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252620 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-15Merged revisions 252534 via svnmerge from lmadsen1-11/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r252534 | lmadsen | 2010-03-15 15:52:32 -0500 (Mon, 15 Mar 2010) | 15 lines Merged revisions 252533 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252533 | lmadsen | 2010-03-15 15:48:56 -0500 (Mon, 15 Mar 2010) | 7 lines Update extensions.ael file to not overlap extensions.conf. Updated the extensions.ael file so the global variables don't overlap those that we have in extensions.conf (sample files). This way unexpected things won't happed hopefully if both pbx_ael and res_config are loaded. (closes issue #17035) Reported by: pprindeville ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252537 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-15Merged revisions 252362 via svnmerge from tilghman3-1/+50
https://origsvn.digium.com/svn/asterisk/trunk ................ r252362 | tilghman | 2010-03-14 20:37:04 -0500 (Sun, 14 Mar 2010) | 11 lines Merged revisions 252361 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252361 | tilghman | 2010-03-14 20:33:50 -0500 (Sun, 14 Mar 2010) | 4 lines Launch Asterisk on Mac OS X with launchd. Reviewboard: https://reviewboard.asterisk.org/r/551/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@252363 f38db490-d61c-443f-a65b-d21fe96a405b