summaryrefslogtreecommitdiff
path: root/apps
AgeCommit message (Collapse)Author
2007-05-22Merged revisions 65408 via svnmerge from BJ Weschke
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65408 | bweschke | 2007-05-22 10:02:56 -0400 (Tue, 22 May 2007) | 3 lines Fix a problem with flag recognition. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-22Fix a couple of spots in the handling of device states that could lead to aRussell Bryant
double free. (issue #9772, reported by Mike Anikienko, fix by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65375 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-21I know we have talked about rewriting app_queue for Asterisk 1.6, but once IRussell Bryant
saw this, I couldn't help myself from changing it. Previously, for *every* device state change, app_queue would spawn a thread to handle it. Now, the device state callback just puts the state change in a queue and it gets handled by a single state change processing thread. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-18Merged revisions 65200 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65200 | murf | 2007-05-18 16:06:27 -0600 (Fri, 18 May 2007) | 9 lines Merged revisions 65172 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r65172 | murf | 2007-05-18 14:56:20 -0600 (Fri, 18 May 2007) | 1 line This update will fix the situation that occurs as described by 9717, where when several targets are specified for a dial, if any one them reports FAIL, the whole call gets FAIL, even though others were ringing OK. I rearranged the priorities, so that a new disposition, NULL, is at the lowest level, and the disposition get init'd to NULL. Then, next up is FAIL, and next up is BUSY, then NOANSWER, then ANSWERED. All the related set routines will only do so if the disposition value to be set to is greater than what's already there. This gives the intended effect. So, if all the targets are busy, you'd get BUSY for the call disposition. If all get BUSY, but one, and that one rings is not answered, you get NOANSWER. If by some freak of nature, the NULL value doesn't get overridden, then the disp2str routine will report NOANSWER as before. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-18Issue #5930 - Remove dependencies on res_adsi.so - clwadeOlle Johansson
A big THANK YOU to clwade for this patch. Minor modifications by me. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64921 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-18Merged revisions 64868 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r64868 | russell | 2007-05-17 21:48:51 -0500 (Thu, 17 May 2007) | 5 lines Fix a small bug I noticed while working on something else. app_queue did not unregister its device state monitoring callback in unload_module(). So, this would make Asterisk crash on the first device state change after you unload the module. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-17Merged revisions 64761 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r64761 | qwell | 2007-05-17 11:53:27 -0500 (Thu, 17 May 2007) | 12 lines Merged revisions 64758 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r64758 | qwell | 2007-05-17 11:52:38 -0500 (Thu, 17 May 2007) | 4 lines If we have a negative current message, we shouldn't go back even further... Issue 9727. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-17Merged revisions 64756 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r64756 | russell | 2007-05-17 11:47:29 -0500 (Thu, 17 May 2007) | 3 lines Increase the size of a buffer to support longer dial strings for channels. (issue #9291, reported and fix suggested by meni) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64757 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-17Merged revisions 64720 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r64720 | file | 2007-05-17 09:48:44 -0400 (Thu, 17 May 2007) | 2 lines Fix authuser support. (issue #9740 reported by xmarksthespot) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-14Don't allow rounding seconds to weird values that may cause "unexpected" ↵Jason Parker
results. Issue 9514. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-14Add 'c' option to app_queue which allows for continuing in the dialplan if ↵Jason Parker
the callee hangs up. Issue 9284, patch by lyl, modified a little bit by me (I felt 'continue' was better than 'keepalive') git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-10Fixing reload. Thanks to Mats Karlsson!Olle Johansson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-09Merged revisions 63566 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r63566 | tilghman | 2007-05-09 09:50:33 -0500 (Wed, 09 May 2007) | 10 lines Merged revisions 63565 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r63565 | tilghman | 2007-05-09 09:48:06 -0500 (Wed, 09 May 2007) | 2 lines Replicate fix from 51158 (app_voicemail) to app_directory (Issue 9224) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-08Merged revisions 63478 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r63478 | tilghman | 2007-05-08 17:38:02 -0500 (Tue, 08 May 2007) | 10 lines Merged revisions 63477 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r63477 | tilghman | 2007-05-08 17:19:15 -0500 (Tue, 08 May 2007) | 2 lines Issue 9602 - segfault in app_macro ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-08Merged revisions 63360 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r63360 | tilghman | 2007-05-08 01:22:37 -0500 (Tue, 08 May 2007) | 10 lines Merged revisions 63359 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r63359 | tilghman | 2007-05-08 01:20:16 -0500 (Tue, 08 May 2007) | 2 lines Issue 9527 - upon entering a folder, no message is selected (curmsg == -1), so deleting causes memory corruption (beyond bounds) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-07Make a minor tweak to admin_exec() - don't lock the conference list until itRussell Bryant
is actually necessary. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63326 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-07Add a new application, MeetMeChannelAdmin, which is similar to MeetMeAdmin,Russell Bryant
except it lets you operate on a channel by name instead of conference member number. It is very useful in combination with the 'X' option to ChanSpy. (issue #9671, patch by mnicholson, with some small modifications by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02When a conference is created, the UNIQUEID of the channel that caused it to beRussell Bryant
created will now be stored. Then, every channel that joins the conference will have the MEETMEUNIQUEID channel variable set with this ID. This can be used to relate callers that come and go from long standing conferences. (issue #7295, patch by softins) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01Merged revisions 62545 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r62545 | tilghman | 2007-05-01 16:34:43 -0500 (Tue, 01 May 2007) | 2 lines Bug 9590 - Memory leaks around find_user() (found by rayjay, different fixes by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30This patch adds additional information to the EXITWITHKEY and EXITWITHTIMEOUTRussell Bryant
entries in the queue log. (issue #7561, reported and originally patched by fkasumovic, patch slightly modified and updated to trunk by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62462 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-28Enable the functionality of the 'o' option to "optimize talker" by default.Russell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-28Merge changes from team/russell/eventsRussell Bryant
This set of changes introduces a new generic event API for use within Asterisk. I am still working on a way for events to be shared between servers, but this part is ready and can already be used inside of Asterisk. This set of changes introduces the first use of the API, as well. I have restructured the way that MWI (message waiting indication) is handled. It is now event based instead of polling based. For example, if there are a bunch of SIP phones subscribed to mailboxes, then chan_sip will not have to constantly poll the mailboxes for changes. app_voicemail will generate events when changes occur. See UPGRADE.txt and CHANGES for some more information on the effects of these changes from the user perspective. For developer information, see the text in include/asterisk/event.h. As always, additional feedback is welcome on the asterisk-dev mailing list. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-27Add a min-announce-frequency option to queues.conf which allows you to ↵Russell Bryant
control the minimum amount of time between queue announcements for use when the caller's queue position changes frequently. (issue #9604, patch by Matthew Roth) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-20Merged revisions 61694 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r61694 | qwell | 2007-04-20 14:51:49 -0500 (Fri, 20 Apr 2007) | 13 lines Merged revisions 61692 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61692 | qwell | 2007-04-20 14:49:54 -0500 (Fri, 20 Apr 2007) | 5 lines If the '* to hangup' option is not enabled, we don't need to disable * as a valid exit key. If it was enabled, this statement would've never been checked in the first place. Issue #9552 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-20Merged revisions 61690 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r61690 | russell | 2007-04-20 13:19:18 -0500 (Fri, 20 Apr 2007) | 4 lines Fix the UpdateConfig manager action to properly treat "variables" and "objects" differently (a=b versus a=>b). (issue #9568, reported by pari, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-18Mini-voicemail - an embryo for a new voicemail system based on buildingOlle Johansson
blocks instead of one large monolithic app. Supports multiple templates and is designed mostly for voicemail delivery over e-mail. There's a todo with a list of ideas in the source code if you want to contribute. Feedback is appreciated! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13Merged revisions 61656 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r61656 | file | 2007-04-13 15:17:08 -0400 (Fri, 13 Apr 2007) | 10 lines Merged revisions 61655 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61655 | file | 2007-04-13 15:15:12 -0400 (Fri, 13 Apr 2007) | 2 lines Add OUTBOUND_GROUP_ONCE variable to app_dial. This behaves the same as OUTBOUND_GROUP except it will get unset after use so it won't get accidentally inherited. (issue #BE-140) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13Merged revisions 61651 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r61651 | file | 2007-04-13 14:08:02 -0400 (Fri, 13 Apr 2007) | 2 lines Do not bother looking for a result if none are present. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-13Merged revisions 61645 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r61645 | russell | 2007-04-13 12:10:19 -0500 (Fri, 13 Apr 2007) | 3 lines Eliminate a compiler warning with ODBC_STORAGE enabled so that it will build under dev-mode. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-11via 8119, a patch to allow voicemail data to be stored in RealTime.Steve Murphy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10Merged revisions 60989 via svnmerge from Steve Murphy
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60989 | murf | 2007-04-09 12:32:07 -0600 (Mon, 09 Apr 2007) | 1 line This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered. This also adds the mods from 1.4/r.61136; ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09Remove unused instances of unnamed enums.Russell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09Merged revisions 61022 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r61022 | qwell | 2007-04-09 14:05:48 -0500 (Mon, 09 Apr 2007) | 4 lines Use the appropriate interface name with COMPLETECALLER. Issue 9395. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09Merged revisions 60936 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r60936 | qwell | 2007-04-09 12:22:59 -0500 (Mon, 09 Apr 2007) | 13 lines Merged revisions 60935 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r60935 | qwell | 2007-04-09 12:22:15 -0500 (Mon, 09 Apr 2007) | 5 lines Allow matching on names shorter than 3 chars. This also fixes the case where somebody wants to match on less then 3 chars. Issue 9071 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09Merged revisions 60798 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r60798 | file | 2007-04-08 21:03:14 -0400 (Sun, 08 Apr 2007) | 10 lines Merged revisions 60797 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r60797 | file | 2007-04-08 20:59:29 -0400 (Sun, 08 Apr 2007) | 2 lines When calling a device that then forwards us elsewhere... we have to make our channels compatible if it is the only channel being dialed. (issue #9445 reported by marcelbarbulescu) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-08Merged revisions 60762 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60762 | file | 2007-04-08 13:04:44 -0400 (Sun, 08 Apr 2007) | 2 lines Allow app_queue to use MONITOR_EXEC even if MONITOR_OPTIONS is not set. (issue #9495 reported by cduffy) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-08Merged revisions 60713 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r60713 | tilghman | 2007-04-08 09:14:29 -0500 (Sun, 08 Apr 2007) | 10 lines Merged revisions 60711 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r60711 | tilghman | 2007-04-08 09:00:22 -0500 (Sun, 08 Apr 2007) | 2 lines Gosub called within a Macro resets the arguments improperly and causes general weirdness. (Issue 8329) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60715 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-06Merged revisions 60565 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60565 | russell | 2007-04-06 14:50:52 -0500 (Fri, 06 Apr 2007) | 3 lines When a station picks up a trunk that was on hold, make the hints reflect that nobody has the trunk on hold anymore. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-06Merged revisions 60521 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60521 | russell | 2007-04-06 13:58:46 -0500 (Fri, 06 Apr 2007) | 16 lines Fix a few problems with SLA. (issue #9459, reported by francesco_r, fixed by me) * The original behavior was that if one station put a call on hold, another one picked it up, and then hung up, the code would still consider the call on hold by the first station, so the trunk would not be hung up. However, to better comply with what most people seem to expect it to behave, it will now hang up the trunk. * Fix a problem with "barge=no". This was only intended to prevent people from joining calls that are in progress. However, it also prevented other people from picking up a call that was on hold. This has been fixed. * When there are no active stations on a trunk and it is on hold, the code now indicates the HOLD and UNHOLD conditions to the trunk channel. This allows music on hold to be played to the trunk when it is on hold. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-06Merged revisions 60361 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60361 | file | 2007-04-05 22:14:00 -0300 (Thu, 05 Apr 2007) | 2 lines Add support for returning different types of results (ie: NBest). ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-05Merged revisions 60268 via svnmerge from Jason Parker
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r60268 | qwell | 2007-04-05 11:10:48 -0500 (Thu, 05 Apr 2007) | 13 lines Merged revisions 60267 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r60267 | qwell | 2007-04-05 11:09:41 -0500 (Thu, 05 Apr 2007) | 5 lines Just because we can't find the voicemail configuration file, doesn't mean that the module failed to load. The user could be using realtime. Issue #9473 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-04Merged revisions 60069 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r60069 | russell | 2007-04-04 11:26:23 -0500 (Wed, 04 Apr 2007) | 4 lines Fix a problem where if a trunk was hung up while it was on hold, all of the hints would reflect the line still on hold, even though it should reflect that it is back to not in use. (issue #9459, reported by francesco_r, fixed by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-03Merged revisions 59963 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r59963 | file | 2007-04-03 15:40:59 -0400 (Tue, 03 Apr 2007) | 2 lines Don't clash when a person both speaks and uses DTMF. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-02Merged revisions 59724 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59724 | file | 2007-04-02 14:58:24 -0400 (Mon, 02 Apr 2007) | 10 lines Merged revisions 59723 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r59723 | file | 2007-04-02 14:55:25 -0400 (Mon, 02 Apr 2007) | 2 lines Increase the maximum size for a string of mailboxes to 1024. (issue #9270 reported by rtucker) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29Reduce the ridiculous number of variables used in the load_config() function byRussell Bryant
just having one that can be re-used. There is no functional change here (that is intentional, anyway!). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29Add the ability for the "voicemail show users" CLI command to show usersRussell Bryant
configured in realtime. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29Merged revisions 59361 via svnmerge from Joshua Colp
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59361 | file | 2007-03-29 13:38:55 -0400 (Thu, 29 Mar 2007) | 10 lines Merged revisions 59360 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r59360 | file | 2007-03-29 13:33:58 -0400 (Thu, 29 Mar 2007) | 2 lines Keep a global array of variables indicating whether certain conference rooms are in use. This ensures that two people going into a new dynamic conference when the 'e' option is set don't go into the same conference room. (issue #8835 reported by eliel) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-27Merged revisions 59284 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59284 | tilghman | 2007-03-27 18:37:31 -0500 (Tue, 27 Mar 2007) | 10 lines Merged revisions 59283 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r59283 | tilghman | 2007-03-27 18:36:49 -0500 (Tue, 27 Mar 2007) | 2 lines Oops ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-27Merged revisions 59281 via svnmerge from Tilghman Lesher
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59281 | tilghman | 2007-03-27 18:32:46 -0500 (Tue, 27 Mar 2007) | 10 lines Merged revisions 59280 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r59280 | tilghman | 2007-03-27 18:31:20 -0500 (Tue, 27 Mar 2007) | 2 lines Fix a few remaining bad mmap(2) return values ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-27Merged revisions 59278 via svnmerge from Russell Bryant
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r59278 | russell | 2007-03-27 18:20:22 -0500 (Tue, 27 Mar 2007) | 11 lines Merged revisions 59277 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r59277 | russell | 2007-03-27 18:19:41 -0500 (Tue, 27 Mar 2007) | 3 lines Fix the check of the return value from mmap(). Thanks to Corydon for catching this one. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59279 65c4cc65-6c06-0410-ace0-fbb531ad65f3