12385 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Fredrickson	7f233a8dc2	Let's NOT create a deadlock scenario here ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72304 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 21:44:13 +00:00
Russell Bryant	8d89f741a5	Merged revisions 72272 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r72272 | russell | 2007-06-27 16:08:34 -0500 (Wed, 27 Jun 2007) | 13 lines Merged revisions 72267 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r72267 | russell | 2007-06-27 16:06:45 -0500 (Wed, 27 Jun 2007) | 5 lines Fix a minor issue with parsing the priority number. You could have as much whitespace as you want around a numeric priority, but you couldn't have any whitespace around a special priority like "n" or "hint". (issue #10039, reported by mitheloc, fixed by me) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72274 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 21:09:24 +00:00
Brett Bryant	dee58f2531	Merged revisions 72260 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r72260 | bbryant | 2007-06-27 15:46:12 -0500 (Wed, 27 Jun 2007) | 12 lines Merged revisions 72259 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r72259 | bbryant | 2007-06-27 15:43:53 -0500 (Wed, 27 Jun 2007) | 4 lines Fixes 100% load when controlling terminal disappears. Issue #9654, #10010 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72261 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 20:47:45 +00:00
Joshua Colp	809c1398d7	Merged revisions 72257 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r72257 | file | 2007-06-27 16:25:24 -0400 (Wed, 27 Jun 2007) | 10 lines Merged revisions 72256 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r72256 | file | 2007-06-27 16:23:24 -0400 (Wed, 27 Jun 2007) | 2 lines I may possibly get shot for doing this... but... defer CDR processing until after the channel has been dealt with. This should eliminate all of the issues with channels going funky (SIP/PRI) when you are posting CDRs to a database that is either slow or unavailable and do not want to enable batching. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72258 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 20:26:53 +00:00
Joshua Colp	08fa65de5e	Fix up properties. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72241 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 20:07:46 +00:00
Joshua Colp	2c52ab7afb	Fix -T option. (issue #10073 reported by xylome) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72233 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 19:57:36 +00:00
Mark Michelson	4596af13fc	Adding feature to support the storage and retrieval of voicemail greetings using IMAP storage. ... This feature may be turned on by adding imapgreetings=yes to the general section of voicemail.conf voicemail.conf.sample has details on the options added. As a result, IMAP storage now has RETRIEVE and DISPOSE macros defined. In addition to the IMAP greeting changes, I also have added an enum for the voicemail folders and so now the code should be easier to understand and maintain when it comes to this area. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72232 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 19:50:21 +00:00
Kevin P. Fleming	86fcb89338	Merged revisions 72205 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72205 | kpfleming | 2007-06-27 14:13:21 -0500 (Wed, 27 Jun 2007) | 2 lines use the proper type for storing group number bits so that if someone specifies 'group=42' it will actually work instead of being silently ignored ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72207 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 19:13:54 +00:00
Jason Parker	37ebf4da54	Merged revisions 72182 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72182 | qwell | 2007-06-27 13:36:56 -0500 (Wed, 27 Jun 2007) | 4 lines Fix another problem in voicemail with missing symbols. Issue 10074, patch by kryptolus, extended to include #if 0'd blocks (just in case) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72183 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 18:37:44 +00:00
Joshua Colp	7feaaaaf04	Merged revisions 72148 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72148 | file | 2007-06-27 13:31:50 -0400 (Wed, 27 Jun 2007) | 2 lines Make the ast_read_noaudio API call behave better under circumstances where DTMF emulation was happening and a generator was setup. (issue #10065 reported by stevefeinstein) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72149 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 17:34:26 +00:00
Jason Parker	8bf745194f	Merged revisions 72125 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72125 | qwell | 2007-06-27 12:10:32 -0500 (Wed, 27 Jun 2007) | 4 lines Don't modify a variable that we don't want modified. Make a copy of it instead. Issue 10029, patch by phsultan with slight modifications by me (to remove needless casts). Note: chan_jingle in trunk does not appear to have the same bug. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72134 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 17:14:31 +00:00
Russell Bryant	36b0448bc1	Merged revisions 72112 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72112 | russell | 2007-06-27 11:34:24 -0500 (Wed, 27 Jun 2007) | 3 lines Only output debug information related to RTCP timestamps when RTCP debug is turned on (issue #10066, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72113 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 16:38:12 +00:00
Christian Richter	bc478d6c41	Merged revisions 72042 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r72042 | crichter | 2007-06-27 09:58:06 +0200 (Mi, 27 Jun 2007) | 13 lines Merged revisions 72040-72041 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r72040 | crichter | 2007-06-27 09:49:27 +0200 (Mi, 27 Jun 2007) | 1 line for inbound TE calls, we setup the bchannel when we get the CONNECT_ACKNOWLEDGE, to make sure mISDN has everything ready. removed some #if 0 areas which weren't used anymore. ........ r72041 | crichter | 2007-06-27 09:54:30 +0200 (Mi, 27 Jun 2007) | 1 line isdn_lib.c didn't compile ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72052 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 08:08:58 +00:00
Joshua Colp	36668045a6	Merged revisions 72006 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r72006 | file | 2007-06-26 20:58:35 -0400 (Tue, 26 Jun 2007) | 2 lines Make unloading of pbx_dundi actually work. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72007 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-27 01:00:47 +00:00
Joshua Colp	1961b57705	Add rtpdest option to SIP CHANNEL() dialplan function to return the IP address and port that RTP (be it audio/video/text) is going to. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71988 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 23:31:23 +00:00
Mark Michelson	a333f7a474	Merged revisions 71953 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71953 | mmichelson | 2007-06-26 18:02:09 -0500 (Tue, 26 Jun 2007) | 4 lines Removing a pointless line. This variable was already set earlier and between then and this line, there is no way that the values on the right side of the assignment could have changed. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71954 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 23:03:09 +00:00
Mark Michelson	27654c6a76	The variable msgnum was being overwritten if IMAP storage was enabled. ... Put necessary #ifndef's around the line which would overwrite. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71952 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 22:45:16 +00:00
Jason Parker	792beb4686	Merged revisions 71915 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71915 | qwell | 2007-06-26 15:36:09 -0500 (Tue, 26 Jun 2007) | 4 lines Don't dereference a pointer that may be NULL here. Issue 10017. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71916 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 20:36:50 +00:00
Mark Michelson	49c22c3c04	Create directory if it does not exist. ... (Closes issue 10061, Reported and patched by eliel) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71914 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 20:34:46 +00:00
Mark Michelson	e7ca771f95	Merged revisions 71877 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71877 | mmichelson | 2007-06-26 14:00:05 -0500 (Tue, 26 Jun 2007) | 11 lines A few changes, the ultimate goal of which is to keep better track of the number of messages that a mailbox currently has. A description of the changes: 1. Changed the "updated" field of the vm_state struct to act more as a binary semaphore than a counting semaphore, since its current implementation made the inboxcount function not work properly. This change falls in line with a change made by UPenn with their IMAP setup and helps to sync our changes with theirs. 2. Eliminated some redundant calls to get_vm_state_by_mailbox inside leave_voicemail 3. Use the play_folder variable to keep track of the number of old and new messages in a mailbox as the messages are deleted 4. Added an increment to the number of new messages that was not there previously in the leave_voicemail function ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71883 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 19:06:47 +00:00
Jason Parker	e3cf86f4b3	Simplify some code in res_jabber relating to SASL support. ... Issue 9988, patch by phsultan. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71830 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 16:39:22 +00:00
Mark Michelson	6dc12782c7	Merged revisions 71796 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71796 | mmichelson | 2007-06-26 10:47:31 -0500 (Tue, 26 Jun 2007) | 5 lines Fixing bug where the authuser was mistakenly pulled from the mailbox string instead of the IMAP user. (closes issue 10054, reported and patched by jaroth) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71797 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 15:50:11 +00:00
Tilghman Lesher	17892ed419	Merged revisions 71751 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71751 | tilghman | 2007-06-26 07:27:47 -0500 (Tue, 26 Jun 2007) | 10 lines Merged revisions 71750 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r71750 | tilghman | 2007-06-26 07:25:58 -0500 (Tue, 26 Jun 2007) | 2 lines Issue 10062 - Trying to move a message without selecting one first results in memory corruption ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71752 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 12:30:59 +00:00
Mark Michelson	d2f93119c5	Fixes a problem where Asterisk would not compile if IMAP_STORAGE was enabled. ... Needed to add a space between file name and options. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71732 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-26 00:10:09 +00:00
Mark Michelson	de47fc6c47	In my commit earlier today, I accidentally left a prototype that isn't defined. ... This gets rid of that prototype. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71721 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 23:18:19 +00:00
Russell Bryant	ab56fcce5c	Allow compilation off app_voicemail with IMAP_STORAE against a system installed ... version of the c-client library. (issue #10047, jcollie) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71688 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 19:20:07 +00:00
Tilghman Lesher	82e2033519	Merged revisions 71657 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71657 | tilghman | 2007-06-25 13:14:59 -0500 (Mon, 25 Jun 2007) | 10 lines Merged revisions 71656 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r71656 | tilghman | 2007-06-25 13:12:37 -0500 (Mon, 25 Jun 2007) | 2 lines Issue 10035 - handle_exec returns a result inconsistent with all of the other AGI commands ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71658 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 18:20:18 +00:00
Steve Murphy	af42e2ca7b	Luigi's suggestion to move the llfrom decl was a good one. Done. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71637 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 16:43:33 +00:00
Mark Michelson	3f3a8af232	Using inboxcount instead of countmessages. ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71630 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 16:13:26 +00:00
Joshua Colp	d77301b8cd	Tweak CLI command completion and some help text. (issue #10049 reported by IgorG) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71613 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 15:35:10 +00:00
Joshua Colp	b7cd8648b5	Merged revisions 71576 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71576 | file | 2007-06-25 10:13:45 -0400 (Mon, 25 Jun 2007) | 2 lines Build a peer as well when hash323 is enabled in users.conf (issue #9599 reported by asagage) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71577 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 14:15:05 +00:00
Russell Bryant	5590f67f58	Convert so more logging to ast_debug (issue #10045, dimas) ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71557 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 13:42:51 +00:00
Joshua Colp	b8d64002b2	Merged revisions 71522 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71522 | file | 2007-06-25 09:03:03 -0400 (Mon, 25 Jun 2007) | 2 lines Minor tweak for queueing up the unhold frame... this will teach me to do bugs while half asleep. (issue #10046 reported by dimas) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71525 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 13:04:36 +00:00
Joshua Colp	9b23b9b3b2	Minor header inclusion tweak for new usage of stat() ... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71521 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 13:00:49 +00:00
Russell Bryant	65a9e8fbe9	Merged revisions 71519 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71519 | russell | 2007-06-25 07:40:06 -0500 (Mon, 25 Jun 2007) | 2 lines Fix a typo in the Asterisk mib. (issue #10048, Matti) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71520 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 12:40:41 +00:00
Christian Richter	1e6b6d2df5	Merged revisions 71214 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71214 | crichter | 2007-06-23 00:44:42 +0200 (Sa, 23 Jun 2007) | 9 lines Merged revisions 70341 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r70341 | crichter | 2007-06-20 17:29:09 +0200 (Mi, 20 Jun 2007) | 1 line fixed a bug that was introduced by copy and paste in the last commit ..bchannels weren't cleaned properly. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71500 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 09:46:18 +00:00
Christian Richter	d72da1523d	Merged revisions 71123 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71123 | crichter | 2007-06-22 17:38:08 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 70672 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r70672 | crichter | 2007-06-21 15:11:29 +0200 (Do, 21 Jun 2007) | 1 line we activate the bchannels in TE mode on incoming calls only when we want to connect the call. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71499 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 09:44:35 +00:00
Christian Richter	71f6d61265	Merged revisions 71122 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71122 | crichter | 2007-06-22 17:34:31 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 70342 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r70342 | crichter | 2007-06-20 17:42:39 +0200 (Mi, 20 Jun 2007) | 1 line forgot one place .. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71498 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 09:42:15 +00:00
Christian Richter	829f58b228	Merged revisions 71121 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71121 | crichter | 2007-06-22 17:32:54 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 70311 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r70311 | crichter | 2007-06-20 16:47:59 +0200 (Mi, 20 Jun 2007) | 1 line on receiption of cause:44 we mark the channel as in use and inform the user about the situation, we need to test the RESTART stuff then. Also shuffled the empty_chan_in_stack function after the bchannel cleaning functions, to avoid race conditions. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71497 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 09:37:49 +00:00
Christian Richter	e57fa9fa82	Merged revisions 71120 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71120 | crichter | 2007-06-22 17:30:08 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 69887 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r69887 | crichter | 2007-06-19 15:23:04 +0200 (Di, 19 Jun 2007) | 1 line when we send out a SETUP, but get no response, we should cleanup everything after reception of a hangup. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71496 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 09:34:05 +00:00
Christian Richter	f804c7ef5f	Merged revisions 71118 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71118 | crichter | 2007-06-22 17:27:53 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 69053 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r69053 | crichter | 2007-06-13 11:55:54 +0200 (Mi, 13 Jun 2007) | 1 line restart indicator 0x80 is correct, at least that's what libpri does. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71483 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 09:06:56 +00:00
Christian Richter	ebd9ba0456	Merged revisions 71106 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71106 | crichter | 2007-06-22 17:22:06 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 68887 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r68887 | crichter | 2007-06-12 10:35:22 +0200 (Di, 12 Jun 2007) | 1 line if the bridged partner is mISDN too we should not send dtmf tones, they are transmitted inband always ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71476 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 08:57:06 +00:00
Christian Richter	a378c3f852	Merged revisions 71096 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71096 | crichter | 2007-06-22 17:17:04 +0200 (Fr, 22 Jun 2007) | 9 lines Merged revisions 68874 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r68874 | crichter | 2007-06-12 09:48:52 +0200 (Di, 12 Jun 2007) | 1 line if we have already some digits, we just stop the tones. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71475 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 08:53:47 +00:00
Joshua Colp	76455dda03	Merged revisions 71430 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71430 | file | 2007-06-24 21:10:06 -0400 (Sun, 24 Jun 2007) | 10 lines Merged revisions 71414 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r71414 | file | 2007-06-24 21:02:49 -0400 (Sun, 24 Jun 2007) | 2 lines Ignore other URIs after the first in a 300 Multiple Choice response. (issue #10041 reported by homesick) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71434 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 01:11:47 +00:00
Joshua Colp	694088e06f	Merged revisions 71422 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71422 | file | 2007-06-24 21:07:31 -0400 (Sun, 24 Jun 2007) | 2 lines Fix it so 1.4 actually compiles on my box. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71425 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 01:08:22 +00:00
Joshua Colp	8bab6c1f69	Merged revisions 71412 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71412 | file | 2007-06-24 20:49:21 -0400 (Sun, 24 Jun 2007) | 2 lines Check to make sure the channel pointer is present before queueing up an unhold frame on it. (issue #10046 reported by dimas) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71413 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-25 00:52:03 +00:00
Russell Bryant	9b1788668c	Merged revisions 71371 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71371 | russell | 2007-06-24 15:16:32 -0500 (Sun, 24 Jun 2007) | 3 lines Include the menuselect-tree file in tarballs to make builds from tarballs a little bit faster ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71372 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-24 20:17:43 +00:00
Russell Bryant	8f2d952945	Merged revisions 71362 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r71362 | russell | 2007-06-24 15:06:31 -0500 (Sun, 24 Jun 2007) | 10 lines Merged revisions 71358 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r71358 | russell | 2007-06-24 15:04:21 -0500 (Sun, 24 Jun 2007) | 2 lines Revert the patch from issue 9654 due to an unexpected side effect ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71365 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-24 20:07:15 +00:00
Russell Bryant	80166c6de8	Conversions to ast_debug() ... (issue #9984, patches from eliel and dimas) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71338 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-24 18:51:41 +00:00
Tilghman Lesher	2e4b41841d	Merged revisions 71291 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r71291 | tilghman | 2007-06-24 12:50:24 -0500 (Sun, 24 Jun 2007) | 2 lines Issue 10044 - chan->cdr is NULL here, so peer->cdr is what we really wanted to use ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71292 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2007-06-24 17:51:55 +00:00