aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2010-02-08Merged revisions 245624 via svnmerge from russell1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r245624 | russell | 2010-02-08 17:43:00 -0600 (Mon, 08 Feb 2010) | 5 lines Fix return value of get_ie_str() and get_ie_str_hash() for non-existent IE. I found this bug while developing a unit test for event allocation. Testing is awesome. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@245626 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245578 via svnmerge from tilghman1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r245578 | tilghman | 2010-02-08 16:31:40 -0600 (Mon, 08 Feb 2010) | 12 lines Actually use _ASTLDFLAGS in the main/ and channels/ Makefiles. They were previously passed correctly, but they simply weren't used. This caused issues with various platforms whose builds needed to pass special linker flags via the configure script. (closes issue #16596) Reported by: pprindeville Patches: asterisk-1.6-astldflags.patch uploaded by pprindeville (license 347) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@245581 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245497 via svnmerge from qwell2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r245497 | qwell | 2010-02-08 14:41:05 -0600 (Mon, 08 Feb 2010) | 11 lines Merged revisions 245496 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r245496 | qwell | 2010-02-08 14:39:50 -0600 (Mon, 08 Feb 2010) | 4 lines Remove reference of documentation in source directory. People don't always build Asterisk from source (distro packages, anybody?). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@245500 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-05Merged revisions 244927 via svnmerge from seanbright1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r244927 | seanbright | 2010-02-05 12:05:32 -0500 (Fri, 05 Feb 2010) | 9 lines Merged revisions 244926 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244926 | seanbright | 2010-02-05 12:03:35 -0500 (Fri, 05 Feb 2010) | 1 line Update main copyright date. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@244930 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-03Merged revisions 244547 via svnmerge from mmichelson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r244547 | mmichelson | 2010-02-03 13:26:53 -0600 (Wed, 03 Feb 2010) | 3 lines Initialize counters in ast_sched_report so that resulting data is not bogus. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@244555 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-03Merged revisions 244505 via svnmerge from tilghman1-58/+76
https://origsvn.digium.com/svn/asterisk/trunk ........ r244505 | tilghman | 2010-02-03 12:34:29 -0600 (Wed, 03 Feb 2010) | 8 lines The chanvar= setting should inherit the entire list of variables, not just the first one. (closes issue #16359) Reported by: raarts Patches: dahdi-setvars.diff uploaded by raarts (license 937) Tested by: raarts ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@244508 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-02Merged revisions 244443 via svnmerge from dvossel1-5/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r244443 | dvossel | 2010-02-02 16:27:23 -0600 (Tue, 02 Feb 2010) | 18 lines fixes crash during T.38 negotiation caused by invalid or missing FaxMaxDatagram field AST-2010-001 (closes issue #16634) Reported by: krn (closes issue #16724) Reported by: barthpbx (closes issue #16517) Reported by: bklang (closes issue #16485) Reported by: elsto ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@244445 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-01Merged revisions 244071 via svnmerge from tilghman1-15/+15
https://origsvn.digium.com/svn/asterisk/trunk ................ r244071 | tilghman | 2010-02-01 11:53:39 -0600 (Mon, 01 Feb 2010) | 22 lines Merged revisions 244070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244070 | tilghman | 2010-02-01 11:46:31 -0600 (Mon, 01 Feb 2010) | 16 lines Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue. (closes issue #16525) Reported by: kobaz Patches: 20100126__issue16525.diff.txt uploaded by tilghman (license 14) 20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14) Tested by: kobaz, atis (closes issue #16581) Reported by: ZX81 (closes issue #16681) Reported by: alexr1 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@244073 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-28Ensure manager hooks are executed when there are no manager sessions.jpeeler1-21/+25
Conditional expanded to check for hooks before aborting manager event processing. The other two changes are just optimizations. (closes issue #16455) Reported by: atis Patches: manager_hooks_16.patch uploaded by atis (license 242) Tested by: atis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@243989 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243487 via svnmerge from mmichelson1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r243487 | mmichelson | 2010-01-27 12:08:02 -0600 (Wed, 27 Jan 2010) | 9 lines Merged revisions 243486 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243486 | mmichelson | 2010-01-27 12:06:43 -0600 (Wed, 27 Jan 2010) | 3 lines Use a safe list traversal while checking for duplicate vars in pbx_builtin_setvar_helper. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@243490 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243391 via svnmerge from dvossel1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r243391 | dvossel | 2010-01-26 17:56:57 -0600 (Tue, 26 Jan 2010) | 15 lines Merged revisions 243390 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243390 | dvossel | 2010-01-26 17:55:49 -0600 (Tue, 26 Jan 2010) | 9 lines fixes bug with channel receiving wrong privileges after call parking (closes issue #16429) Reported by: Yasuhiro Konishi Patches: features.c.diff uploaded by Yasuhiro Konishi (license 947) Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@243392 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-26Merged revisions 243266 via svnmerge from jpeeler1-11/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r243266 | jpeeler | 2010-01-26 12:20:55 -0600 (Tue, 26 Jan 2010) | 9 lines Merged revisions 243258 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243258 | jpeeler | 2010-01-26 12:19:10 -0600 (Tue, 26 Jan 2010) | 2 lines Remove unnecessary code in ast_read as issue 16058 has been fully solved now. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@243297 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-26Merged revisions 243244 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r243244 | jpeeler | 2010-01-26 12:07:57 -0600 (Tue, 26 Jan 2010) | 12 lines Fix crash resulting from frames with invalid data pointers. In ast_frdup the frame data union does not get set to point to malloced memory if the datalen is zero, so make sure to handle the same case in ast_frisolate appropriately. (closes issue #16058) Reported by: atis Patches: bug16058-fix.patch uploaded by jpeeler (license 325) Tested by: atis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@243247 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 239920 via svnmerge from tilghman1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r239920 | tilghman | 2010-01-13 14:38:42 -0600 (Wed, 13 Jan 2010) | 2 lines Flex uses fwrite incorrectly, which breaks the build. Providing a workaround. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@243061 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242967,242971 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r242967 | tilghman | 2010-01-25 15:38:33 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242966 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242966 | tilghman | 2010-01-25 15:36:33 -0600 (Mon, 25 Jan 2010) | 2 lines Only rebuild parsers by an option in menuselect ........ ................ r242971 | tilghman | 2010-01-25 15:51:41 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242969 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines Err, and use the new menuselect define, too. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242974 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242904 via svnmerge from oej1-6/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r242904 | oej | 2010-01-25 21:27:59 +0100 (Mån, 25 Jan 2010) | 10 lines Merged revisions 242850 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242850 | oej | 2010-01-25 21:03:38 +0100 (Mån, 25 Jan 2010) | 2 lines Report error when writing to functions returns error in AMI setvar action ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242917 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242857 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242852 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines Restore FreeBSD to able-to-compile-ish-mode ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242889 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242729 via svnmerge from tilghman1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r242729 | tilghman | 2010-01-24 23:45:00 -0600 (Sun, 24 Jan 2010) | 9 lines Merged revisions 242728 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines Buildbot pointed out an error (thanks, buildbot!) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242732 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242719 via svnmerge from tilghman1-8/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r242719 | tilghman | 2010-01-24 23:30:33 -0600 (Sun, 24 Jan 2010) | 9 lines Merged revisions 242683 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242683 | tilghman | 2010-01-24 23:13:28 -0600 (Sun, 24 Jan 2010) | 2 lines Make the build of the Asterisk expression parser match that of the AEL parser. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242722 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-22Add Dialed Number Identifier (DNID) field to cdr.alecdavis1-0/+1
Branch support, retains ABI, if backend CDR collector is adaptive then database requires 'dnid' field to be added, otherwise no functional changes. Reported by: alecdavis Tested by: alecdavis Patch cdr_dnid.diff2.txt uploaded by alecdavis (license 585) Review: https://reviewboard.asterisk.org/r/455/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242139 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Merged revisions 241714 via svnmerge from dvossel1-18/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r241714 | dvossel | 2010-01-20 15:14:47 -0600 (Wed, 20 Jan 2010) | 10 lines rtp timestamp to timeval calculation fix The rtp timestamp to timeval calculation was only accurate for 8kHz audio. This patch corrects this. Review: https://reviewboard.asterisk.org/r/468/ SWP-648 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241721 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Update CDR variables as pbx startsalecdavis1-0/+4
Allows CDR variables added in cdr.c:set_one_cid to become visable during the call, by executing ast_cdr_update() early in __ast_pbx_run. Based on cdr_update.diff3.txt (issue #16638) Reported by: alecdavis Patches: cdr_update.diff3.txt uploaded by alecdavis (license 585) Tested by: alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241455 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-19Merged revisions 241366 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r241366 | jpeeler | 2010-01-19 16:59:53 -0600 (Tue, 19 Jan 2010) | 13 lines Initialize data on the stack so that Park doesn't interpret random arguments. passdata was only being set in pbx_substitue_variables when arguments were passed. (closes issue #16406) (closes issue #16586) Reported by: DLNoah Patches: bug16586v2.patch uploaded by jpeeler (license 325) Tested by: DLNoah ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241369 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-18Merged revisions 241016 via svnmerge from seanbright1-22/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r241016 | seanbright | 2010-01-18 14:57:52 -0500 (Mon, 18 Jan 2010) | 19 lines Merged revisions 241015 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241015 | seanbright | 2010-01-18 14:54:19 -0500 (Mon, 18 Jan 2010) | 12 lines Plug a memory leak when reading configs with their comments. While reading through configuration files with the intent of returning their full contents (comments specifically) we allocated some memory and then forgot to free it. This doesn't fix 16554 but clears up a leak I had in the lab. (issue #16554) Reported by: mav3rick Patches: issue16554_20100118.patch uploaded by seanbright (license 71) Tested by: seanbright ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@241019 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-17Merged revisions 240717 via svnmerge from seanbright1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r240717 | seanbright | 2010-01-17 14:45:48 -0500 (Sun, 17 Jan 2010) | 5 lines Avoid a crash on Solaris when running 'core show functions.' (closes issue #16309) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240720 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Merged revisions 240499-240500 via svnmerge from tilghman1-16/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r240499 | tilghman | 2010-01-15 15:40:14 -0600 (Fri, 15 Jan 2010) | 9 lines The previous attempt at using a pipe to guarantee astcanary shutdown did not work. We're revisiting the previous patch, albeit with a method that overcomes the prior criticism that it was not POSIX-compliant. (closes issue #16602) Reported by: frawd Patches: 20100114__issue16602.diff.txt uploaded by tilghman (license 14) Tested by: frawd ........ r240500 | tilghman | 2010-01-15 15:42:36 -0600 (Fri, 15 Jan 2010) | 2 lines Oops, missed an include ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240503 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Merged revisions 240411 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240411 | russell | 2010-01-15 14:41:11 -0600 (Fri, 15 Jan 2010) | 7 lines Ensure payload type is properly checked when comparing against cached events. (closes issue #16607) Reported by: ddv2005 Patches: event.patch uploaded by ddv2005 (license 769) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240413 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240175 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines Similarly, ensure that matchcid is duplicated correctly when merging contexts. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240178 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240129 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240129 | tilghman | 2010-01-14 10:52:22 -0600 (Thu, 14 Jan 2010) | 4 lines Ensure that the callerid is NULL when the parent is effectively NULL. This applies only to pattern-match hints, which create exact-match hints on the fly. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240132 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240078 via svnmerge from mnicholson1-3/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r240078 | mnicholson | 2010-01-14 10:14:35 -0600 (Thu, 14 Jan 2010) | 2 lines This change fixes a few bugs in the way the far max IFP was calculated that were introduced in r231692. (closes issue #16497) Reported by: globalnetinc Patches: udptl-max-ifp-fix1.diff uploaded by mnicholson (license 96) Tested by: globalnetinc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@240079 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239839 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines Merged revisions 239838 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines Fix regression for timed out parked call returning to caller This issue seems to have been exposed by the fix in 160390 whereby using a masquerade prevented a crash. The new channel used in the masquerade was not copying the macro information from the old channel. (closes issue #15459) Reported by: djrodman Patches: patch_15459.txt uploaded by mnick (license ) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239840 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239712 via svnmerge from dvossel1-7/+25
https://origsvn.digium.com/svn/asterisk/trunk ........ r239712 | dvossel | 2010-01-13 10:31:14 -0600 (Wed, 13 Jan 2010) | 24 lines add silence gen to wait apps asterisk.conf's 'transmit_silence' option existed before this patch, but was limited to only generating silence while recording and sending DTMF. Now enabling the transmit_silence option generates silence during wait times as well. To achieve this, ast_safe_sleep has been modified to generate silence anytime no other generators are present and transmit_silence is enabled. Wait apps not using ast_safe_sleep now generate silence when transmit_silence is enabled as well. (closes issue #16524) Reported by: kobaz (closes issue #16523) Reported by: kobaz Tested by: dvossel Review: https://reviewboard.asterisk.org/r/456/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239713 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239665 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r239665 | oej | 2010-01-13 11:45:19 +0100 (Ons, 13 Jan 2010) | 2 lines MAX() moved to utils.h ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239666 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-12Merged revisions 239571 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines Blank callerid and NULL callerid should not compare equal. The second is the default state for matching CID in the dialplan (no matching) while the first matches one particular CallerID. This is a regression. (fixes AST-314, SWP-611) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239575 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-09Merged revisions 238916 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r238916 | tilghman | 2010-01-08 19:08:04 -0600 (Fri, 08 Jan 2010) | 13 lines Merged revisions 238915 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238915 | tilghman | 2010-01-08 18:57:58 -0600 (Fri, 08 Jan 2010) | 6 lines -1 is interpreted as an error, intead of the maximum mask. (closes issue #16241) Reported by: vnovy Patches: manager.c.patch uploaded by vnovy (license 922) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238985 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238835 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r238835 | jpeeler | 2010-01-08 17:30:55 -0600 (Fri, 08 Jan 2010) | 11 lines Merged revisions 238834 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238834 | jpeeler | 2010-01-08 17:28:37 -0600 (Fri, 08 Jan 2010) | 4 lines Stop a crash when no peer is passed to masq_park_call. (distantly related to issue #16406) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238838 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238635 via svnmerge from dvossel1-1/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r238635 | dvossel | 2010-01-08 13:39:30 -0600 (Fri, 08 Jan 2010) | 22 lines fixes AUDIOHOOK_INHERIT regression During the process of removing an audiohook from one channel and attaching it to another the audiohook's status is updated to DONE and then back to whatever it was previously. Typically updating the status after setting it to DONE is not a good idea because DONE can trigger unrecoverable audiohook destruction events... because of this a conditional check was added to audiohook_update_status to explicitly prevent the audiohook from ever changing after being set to DONE. It was this check that prevented audiohook inherit from work properly though. Now ast_audiohook_move_by_source is treated as a special exception, as the audiohook must be returned to its previous status after attaching it to the new channel. This is only a safe operation because the audiohook's lock is held the entire time, otherwise this could cause trouble. (closes issue #16522) Reported by: corruptor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238637 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238630 via svnmerge from mnicholson1-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r238630 | mnicholson | 2010-01-08 13:32:11 -0600 (Fri, 08 Jan 2010) | 12 lines Merged revisions 238629 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238629 | mnicholson | 2010-01-08 13:20:44 -0600 (Fri, 08 Jan 2010) | 5 lines Properly calculate the remaining space in the output string when reducing format strings. (closes issue #16560) Reported by: goldwein ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238632 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238583 via svnmerge from jpeeler1-3/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r238583 | jpeeler | 2010-01-08 11:18:41 -0600 (Fri, 08 Jan 2010) | 5 lines Stop trying to find a parking space after traversing the parkinglot one time. (closes issue #16428) Reported by: Yasuhiro Konishi ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238586 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-07Merged revisions 209400 via svnmerge from tilghman1-8/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r209400 | kpfleming | 2009-07-28 08:49:46 -0500 (Tue, 28 Jul 2009) | 3 lines Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files. (closes issue #16251) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238499 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-06Merged revisions 238134 via svnmerge from jpeeler1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r238134 | jpeeler | 2010-01-06 13:05:06 -0600 (Wed, 06 Jan 2010) | 10 lines Fix channel name comparison for bridge application. The channel name comparison was not comparing the whole string and therefore if one channel name was a substring of the other, the bridge would fail. (closes issue #16528) Reported by: telecos82 Patches: res_features_r236843.diff uploaded by telecos82 (license 687) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@238137 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-05Merged revisions 237839 via svnmerge from dvossel1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r237839 | dvossel | 2010-01-05 13:29:47 -0600 (Tue, 05 Jan 2010) | 19 lines fixes subscriptions being lost after 'module reload' During a module reload if multiple extension configs are present, such as both extensions.conf and extensions.ael, watchers for one config's hints will be lost during the merging of the other config. This happens because hint watchers are only preserved for the current config being merged. The old context list is destroyed after the merging takes place, meaning any watchers that were not perserved will be removed. Now all hints are preserved during merging regardless of what config file is being merged. These hints are only restored if they are present within the new context list. (closes issue #16093) Reported by: jlaroff ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237840 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-05Merged revisions 237699 via svnmerge from russell1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r237699 | russell | 2010-01-05 11:16:01 -0600 (Tue, 05 Jan 2010) | 14 lines Merged revisions 237697 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237697 | russell | 2010-01-05 11:13:28 -0600 (Tue, 05 Jan 2010) | 7 lines Change a NOTICE log message to DEBUG where it belongs. (closes issue #16479) Reported by: alexrecarey (closes SWP-577) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237743 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237574 via svnmerge from tilghman1-26/+26
https://origsvn.digium.com/svn/asterisk/trunk ................ r237574 | tilghman | 2010-01-04 15:48:20 -0600 (Mon, 04 Jan 2010) | 13 lines Merged revisions 237573 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237573 | tilghman | 2010-01-04 15:45:46 -0600 (Mon, 04 Jan 2010) | 6 lines Bounds checking for input string (closes issue #16407) Reported by: qwell Patches: 20100104__issue16407.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237577 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237494 via svnmerge from tilghman1-22/+20
https://origsvn.digium.com/svn/asterisk/trunk ................ r237494 | tilghman | 2010-01-04 14:59:01 -0600 (Mon, 04 Jan 2010) | 15 lines Merged revisions 237493 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237493 | tilghman | 2010-01-04 14:57:35 -0600 (Mon, 04 Jan 2010) | 8 lines Regression in issue #15421 - Pattern matching (closes issue #16482) Reported by: wdoekes Patches: astsvn-16482-betterfix.diff uploaded by wdoekes (license 717) 20091223__issue16482.diff.txt uploaded by tilghman (license 14) Tested by: wdoekes, tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237497 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237414 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r237414 | tilghman | 2010-01-04 13:03:20 -0600 (Mon, 04 Jan 2010) | 2 lines Oops, didn't compile (thanks, kpfleming) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237417 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237410 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r237410 | tilghman | 2010-01-04 12:42:10 -0600 (Mon, 04 Jan 2010) | 7 lines Further reduce the encoded blank values back to blank in the realtime API. (closes issue #16533) Reported by: sergee Patches: 200100104__issue16533.diff.txt uploaded by tilghman (license 14) Tested by: sergee ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237413 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237406 via svnmerge from tilghman1-1/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r237406 | tilghman | 2010-01-04 12:28:28 -0600 (Mon, 04 Jan 2010) | 23 lines Merged revisions 237405 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237405 | tilghman | 2010-01-04 12:19:00 -0600 (Mon, 04 Jan 2010) | 16 lines Add a flag to disable the Background behavior, for AGI users. This is in a section of code that relates to two other issues, namely issue #14011 and issue #14940), one of which was the behavior of Background when called with a context argument that matched the current context. This fix broke FreePBX, however, in a post-Dial situation. Needless to say, this is an extremely difficult collision of several different issues. While the use of an exception flag is ugly, fixing all of the issues linked is rather difficult (although if someone would like to propose a better solution, we're happy to entertain that suggestion). (closes issue #16434) Reported by: rickead2000 Patches: 20091217__issue16434.diff.txt uploaded by tilghman (license 14) 20091222__issue16434__1.6.1.diff.txt uploaded by tilghman (license 14) Tested by: rickead2000 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@237409 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-30Merged revisions 236893 via svnmerge from jpeeler1-0/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r236893 | jpeeler | 2009-12-30 14:34:41 -0600 (Wed, 30 Dec 2009) | 11 lines Fix compiling with LOW_MEMORY. Modified handle_verbose to be LOW_MEMORY aware. (closes issue #16381) Reported by: michael_iedema Patches: ast_complete_source_filename.patch uploaded by michael iedema (license 942) modified by me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@236899 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-28Merged revisions 236713 via svnmerge from qwell2-8/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r236713 | qwell | 2009-12-28 16:09:40 -0600 (Mon, 28 Dec 2009) | 8 lines Allow "REMAINDER" to function properly in expressions. (closes issue #16427) Reported by: wdoekes Patches: ast16-reminder-remainder.patch uploaded by wdoekes (license 717) Tested by: wdoekes ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@236716 f38db490-d61c-443f-a65b-d21fe96a405b