aboutsummaryrefslogtreecommitdiffstats
path: root/funcs
AgeCommit message (Collapse)AuthorFilesLines
2010-03-11Verify whether the created buffer was actually large enough to hold the ↵tilghman1-5/+10
expanded value. For certain types of queries, where the size of the substituted query was much larger than the template, it was possible for the substitution buffer to be too small. This is only an issue in 1.6.1, as previously we used a static buffer anyway, and we have a substitution routine in 1.6.2 forward that automatically sizes itself appropriately to handle larger expansions. (closes issue #17006) Reported by: viniciusfontes Patches: 20100311__issue17006.diff.txt uploaded by tilghman (license 14) Tested by: tilghman git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@251875 f38db490-d61c-443f-a65b-d21fe96a405b
2010-03-04Recorded merge of revisions 250730 via svnmerge from mmichelson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r250730 | mmichelson | 2010-03-04 14:12:26 -0600 (Thu, 04 Mar 2010) | 3 lines Adjust XML for func_channel to indicate that rtpdest can take a "text" argument. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@250732 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-10Merged revisions 246204 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r246204 | tilghman | 2010-02-10 15:24:10 -0600 (Wed, 10 Feb 2010) | 2 lines Fussy compiler on another machine... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246206 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-10Merged revisions 246200 via svnmerge from tilghman1-6/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r246200 | tilghman | 2010-02-10 15:19:35 -0600 (Wed, 10 Feb 2010) | 2 lines Fix weird issue with unit tests on optimized build - turned out to be a signing issue. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246202 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-10Merged revisions 246022 via svnmerge from tilghman1-0/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r246022 | tilghman | 2010-02-10 09:36:57 -0600 (Wed, 10 Feb 2010) | 2 lines Enable warnings on atypical conditions for the FILTER function (suggested by mmichelson on the -dev list). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@246024 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-10Merged revisions 245945 via svnmerge from tilghman1-6/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r245945 | tilghman | 2010-02-10 08:06:12 -0600 (Wed, 10 Feb 2010) | 9 lines Merged revisions 245944 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r245944 | tilghman | 2010-02-10 07:37:13 -0600 (Wed, 10 Feb 2010) | 2 lines Include examples of FILTER usage in extension patterns where a "." may be a risk. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@245947 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-02Merged revisions 244331 via svnmerge from tilghman1-9/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r244331 | tilghman | 2010-02-02 12:54:33 -0600 (Tue, 02 Feb 2010) | 9 lines Correct some off-by-one errors, especially when expressions don't contain expected spaces. Also include the tests provided by the reporter, as regression tests. (closes issue #16667) Reported by: wdoekes Patches: astsvn-func_match-off-by-one.diff uploaded by wdoekes (license 717) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@244333 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243482 via svnmerge from russell1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r243482 | russell | 2010-01-27 11:32:07 -0600 (Wed, 27 Jan 2010) | 13 lines Fix the ability to specify an OSP token for an outbound IAX2 call. When this patch was originally submitted, the code allowed for the token to be set via a channel variable. I decided that a cleaner approach would be to integrate it into the CHANNEL() function. Unfortunately, that is not a suitable approach. It's not possible to get the value set on the channel soon enough using that method. So, go back to the simple channel variable method. (closes issue #16711) Reported by: homesick Patches: iax-svn.diff uploaded by homesick (license 91) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243484 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-21Merged revisions 241766 via svnmerge from tilghman1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r241766 | tilghman | 2010-01-20 23:54:30 -0600 (Wed, 20 Jan 2010) | 9 lines Merged revisions 241765 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241765 | tilghman | 2010-01-20 23:53:17 -0600 (Wed, 20 Jan 2010) | 2 lines Guard against division by zero. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@241768 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-06Merged revisions 238231 via svnmerge from tilghman1-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r238231 | tilghman | 2010-01-06 15:45:17 -0600 (Wed, 06 Jan 2010) | 11 lines Merged revisions 238230 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238230 | tilghman | 2010-01-06 15:41:55 -0600 (Wed, 06 Jan 2010) | 4 lines Revise documentation on disposition values to the actual values used. (closes issue #16289) Reported by: wdoekes ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@238233 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-02Merged revisions 232269 via svnmerge from dvossel1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r232269 | dvossel | 2009-12-02 09:42:54 -0600 (Wed, 02 Dec 2009) | 15 lines Merged revisions 232268 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r232268 | dvossel | 2009-12-02 09:41:36 -0600 (Wed, 02 Dec 2009) | 9 lines fixes segfault in func_groupcount closes issue #16337) Reported by: Parantido Patches: issue_16337.diff uploaded by dvossel (license 671) Tested by: Parantido, dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@232271 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-01Merged revisions 232012 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r232012 | russell | 2009-12-01 17:38:34 -0600 (Tue, 01 Dec 2009) | 2 lines Fix a build error on FreeBSD. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@232014 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-12Merged revisions 229670 via svnmerge from dvossel1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r229670 | dvossel | 2009-11-12 10:44:39 -0600 (Thu, 12 Nov 2009) | 12 lines Merged revisions 229669 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r229669 | dvossel | 2009-11-12 10:41:49 -0600 (Thu, 12 Nov 2009) | 6 lines fixes merging error, datastore was being freed in the wrong function. (closes issue #16219) Reported by: aragon ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@229672 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-06Merged revisions 228620 via svnmerge from mnicholson1-1/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r228620 | mnicholson | 2009-11-06 13:47:11 -0600 (Fri, 06 Nov 2009) | 15 lines Merged revisions 228378 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r228378 | mnicholson | 2009-11-06 10:26:59 -0600 (Fri, 06 Nov 2009) | 8 lines Properly handle '=' while decoding base64 messages and null terminate strings returned from BASE64_DECODE. (closes issue #15271) Reported by: chappell Patches: base64_fix.patch uploaded by chappell (license 8) Tested by: kobaz ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@228650 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-06Merged revisions 228268 via svnmerge from dvossel1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r228268 | dvossel | 2009-11-06 09:04:24 -0600 (Fri, 06 Nov 2009) | 9 lines fixes memory leak in func_audiohookinherit.c (closes issue #15394) Reported by: boroda Patches: bug15394_memoryleak_diff2.txt uploaded by dbrooks (license 790) Tested by: dbrooks, boroda ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@228270 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-20Merged revisions 224856 via svnmerge from tilghman1-8/+13
https://origsvn.digium.com/svn/asterisk/trunk ................ r224856 | tilghman | 2009-10-20 17:09:07 -0500 (Tue, 20 Oct 2009) | 12 lines Merged revisions 224855 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r224855 | tilghman | 2009-10-20 17:07:11 -0500 (Tue, 20 Oct 2009) | 5 lines Pay attention to the return value of the manipulate function. While this looks like an optimization, it prevents a crash from occurring when used with certain audiohook callbacks (diagnosed with SVN trunk, backported to 1.4 to keep the source consistent across versions). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@224858 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-06Merged revisions 222176 via svnmerge from kpfleming1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r222176 | kpfleming | 2009-10-05 20:24:24 -0500 (Mon, 05 Oct 2009) | 27 lines Recorded merge of revisions 222152 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r222152 | kpfleming | 2009-10-05 20:16:36 -0500 (Mon, 05 Oct 2009) | 20 lines Fix ao2_iterator API to hold references to containers being iterated. See Mantis issue for details of what prompted this change. Additional notes: This patch changes the ao2_iterator API in two ways: F_AO2I_DONTLOCK has become an enum instead of a macro, with a name that fits our naming policy; also, it is now necessary to call ao2_iterator_destroy() on any iterator that has been created. Currently this only releases the reference to the container being iterated, but in the future this could also release other resources used by the iterator, if the iterator implementation changes to use additional resources. (closes issue #15987) Reported by: kpfleming Review: https://reviewboard.asterisk.org/r/383/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@222186 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-02Merged revisions 221971 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r221971 | tilghman | 2009-10-02 11:59:57 -0500 (Fri, 02 Oct 2009) | 9 lines Merged revisions 221970 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r221970 | tilghman | 2009-10-02 11:58:03 -0500 (Fri, 02 Oct 2009) | 2 lines Ensure the result of the hash function is positive. Negative array offsets suck. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@221973 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-02Hash needs to return a positive integertilghman1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@221969 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-02Revert XML docs that ended up in the 1.6.0 and 1.6.1 branches during a merge.seanbright1-320/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@221964 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-30Merged revisions 221368 via svnmerge from mnick1-3/+365
https://origsvn.digium.com/svn/asterisk/trunk ................ r221368 | mnick | 2009-09-30 14:42:36 -0500 (Wed, 30 Sep 2009) | 23 lines Merged revisions 221153,221157,221303 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r221153 | mnick | 2009-09-30 10:37:39 -0500 (Wed, 30 Sep 2009) | 2 lines check bounds - prevents for buffer overflow ........ r221157 | mnick | 2009-09-30 10:41:46 -0500 (Wed, 30 Sep 2009) | 8 lines added a new dialplan function 'CSV_QUOTE' and changed the cdr_custom.sample.conf (closes issue #15471) Reported by: dkerr Patches: csv_quote_14.txt uploaded by mnick (license ) Tested by: mnick ........ r221303 | mnick | 2009-09-30 14:02:00 -0500 (Wed, 30 Sep 2009) | 2 lines changed the prototype definition of csv_quote ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@221370 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-30Recorded merge of revisions 221044 via svnmerge from tilghman1-48/+165
https://origsvn.digium.com/svn/asterisk/trunk ........ r221044 | tilghman | 2009-09-29 23:32:36 -0500 (Tue, 29 Sep 2009) | 8 lines Allow locks to be inherited through a masquerade without causing starvation. (closes issue #14859) Reported by: atis Patches: 20090821__issue14859.diff.txt uploaded by tilghman (license 14) 20090925__issue14859__1.6.1.diff.txt uploaded by tilghman (license 14) Tested by: atis, tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@221046 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-10AST-2009-005tilghman10-18/+18
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@211569 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-21Merged revisions 207946 via svnmerge from tilghman1-0/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r207946 | tilghman | 2009-07-21 17:45:32 -0500 (Tue, 21 Jul 2009) | 15 lines Merged revisions 207945 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207945 | tilghman | 2009-07-21 17:38:54 -0500 (Tue, 21 Jul 2009) | 8 lines Force an error if a blank is passed to QUOTE (because the documentation states the argument is not optional). This change makes URIENCODE and QUOTE behave similarly, since the documentation states that the argument is not optional, for both. (closes issue #15439) Reported by: pkempgen Patches: 20090706__issue15439.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@207948 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-21Merged revisions 207680 via svnmerge from kpfleming1-1/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r207680 | kpfleming | 2009-07-21 08:28:04 -0500 (Tue, 21 Jul 2009) | 18 lines Merged revisions 207647 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines Ensure that user-provided CFLAGS and LDFLAGS are honored. This commit changes the build system so that user-provided flags (in ASTCFLAGS and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided by the build system itself, so that the user can effectively override the build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now be provided *either* in the environment before running 'make', or as variable assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS is no longer necessary, so they are no longer documented, but are still supported so as not to break existing build systems that supply them when building Asterisk. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@207684 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-16Merged revisions 206877 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r206877 | dvossel | 2009-07-16 16:45:14 -0500 (Thu, 16 Jul 2009) | 6 lines TIMEOUT(absolute) returned negative value. (closes issue #15513) Reported by: ys ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@206879 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-16Merged revisions 206808 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r206808 | tilghman | 2009-07-16 11:51:05 -0500 (Thu, 16 Jul 2009) | 13 lines Merged revisions 206807 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r206807 | tilghman | 2009-07-16 11:27:35 -0500 (Thu, 16 Jul 2009) | 6 lines Fix a memory leak. (closes issue #15517) Reported by: adomjan Patches: func_realtime.c-ast_variable_destroy.diff uploaded by adomjan (license 487) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@206810 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-27Recorded merge of revisions 197209 via svnmerge from tilghman1-4/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r197209 | tilghman | 2009-05-27 14:20:56 -0500 (Wed, 27 May 2009) | 12 lines Recorded merge of revisions 197194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r197194 | tilghman | 2009-05-27 14:09:42 -0500 (Wed, 27 May 2009) | 5 lines Use a different determinator on whether to print the delimiter, since leading fields may be blank. (closes issue #15208) Reported by: ramonpeek Patch by me, though inspired in part by a patch from ramonpeek ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@197245 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-11Recorded merge of revisions 193545 via svnmerge from lmadsen1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r193545 | lmadsen | 2009-05-11 14:01:44 -0400 (Mon, 11 May 2009) | 14 lines Recorded merge of revisions 193544 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r193544 | lmadsen | 2009-05-11 13:35:17 -0400 (Mon, 11 May 2009) | 7 lines Document CHANNEL(transfercapability) in CLI documentation. (issue #15073) Reported by: pkempgen Patches: 20090511__issue15073.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@193547 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-08Merged revisions 193274 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r193274 | seanbright | 2009-05-08 11:18:40 -0400 (Fri, 08 May 2009) | 2 lines Fix the spelling of UNAVAILABLE in func_devstate CLI completion. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@193335 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-07Merged revisions 193006 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r193006 | tilghman | 2009-05-07 12:51:13 -0500 (Thu, 07 May 2009) | 7 lines Second result should not contain data from the first result. (closes issue #15039) Reported by: jims Patches: 20090506__issue15039.diff.txt uploaded by tilghman (license 14) Tested by: jims ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@193007 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-22Merged revisions 190057 via svnmerge from jpeeler1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r190057 | jpeeler | 2009-04-22 16:15:55 -0500 (Wed, 22 Apr 2009) | 9 lines Fix building of chan_h323 with gcc-3.3 There seems to be a bug with old versions of g++ that doesn't allow a structure member to use the name list. Rename list member to group_list in ast_group_info and change the few places it is used. (closes issue #14790) Reported by: stuarth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@190063 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-16Merged revisions 182211,182278 via svnmerge from tilghman1-19/+38
https://origsvn.digium.com/svn/asterisk/trunk ................ r182211 | tilghman | 2009-03-16 10:50:55 -0500 (Mon, 16 Mar 2009) | 14 lines Merged revisions 182208 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r182208 | tilghman | 2009-03-16 10:39:15 -0500 (Mon, 16 Mar 2009) | 7 lines Fixup glare detection, to fix a memory leak of a local pvt structure. (closes issue #14656) Reported by: caspy Patches: 20090313__bug14656__2.diff.txt uploaded by tilghman (license 14) Tested by: caspy ........ ................ r182278 | tilghman | 2009-03-16 12:33:38 -0500 (Mon, 16 Mar 2009) | 7 lines Fix an off-by-one error in the FILE() function, and extend FILE()'s length parameter to work like variable substitution. Previously, FILE() returned one less character than specified, due to the terminating NULL. Both the offset and length parameters now behave identically to the way variable substitution offsets and lengths also work. (closes issue #14670) Reported by: BMC ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@182280 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-31Merged revisions 172706 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r172706 | tilghman | 2009-01-31 10:40:59 -0600 (Sat, 31 Jan 2009) | 7 lines Don't increment the loop, now that incrementing is taken care of by the decoder function. (closes issue #14363) Reported by: andrew53 Patches: func_strings_filter.patch uploaded by andrew53 (license 519) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172708 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-13Merged revisions 168562 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168562 | russell | 2009-01-13 13:22:13 -0600 (Tue, 13 Jan 2009) | 10 lines Merged revisions 168561 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168561 | russell | 2009-01-13 13:13:05 -0600 (Tue, 13 Jan 2009) | 2 lines Revert unnecessary indications API change from rev 122314 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168565 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-13Merged revisions 168547 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168547 | tilghman | 2009-01-13 11:51:12 -0600 (Tue, 13 Jan 2009) | 13 lines Merged revisions 168546 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168546 | tilghman | 2009-01-13 11:48:00 -0600 (Tue, 13 Jan 2009) | 6 lines If either conditional is NULL, don't try copying it. (closes issue #14226) Reported by: caspy Patches: 20090113__bug14226.diff.txt uploaded by Corydon76 (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168549 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-22Merged revisions 166267 via svnmerge from mmichelson1-5/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r166267 | mmichelson | 2008-12-22 10:07:59 -0600 (Mon, 22 Dec 2008) | 17 lines Fix a file playback crash and explicitly initialize values in func_timeout.c A crash was brought up on the bugtracker. The first run through valgrind was full of legitimate complaints of uninitialized values in func_timeout when setting a response timeout. These were fixed but the crash persisted. A second run through showed the real problem. The reference counting used for filestreams was incorrect because there were some missing increments when a frame was read from a format module. (closes issue #14118) Reported by: blitzrage Patches: 14118v2.patch uploaded by putnopvut (license 60) Tested by: blitzrage ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166275 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-19Switch documentation formats for func_audiohookinherit.cmmichelson1-52/+28
1.6.1 does not have xml documentation, so I reverted to the old way here. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166161 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-19Merged revisions 166092,166095 via svnmerge from mmichelson1-0/+293
https://origsvn.digium.com/svn/asterisk/trunk ........ r166092 | mmichelson | 2008-12-19 16:26:16 -0600 (Fri, 19 Dec 2008) | 28 lines Adding a new dialplan function AUDIOHOOK_INHERIT This function is being added as a method to allow for an audiohook to move to a new channel during a channel masquerade. The most obvious use for such a facility is for MixMonitor when a transfer is performed. Prior to the addition of this functionality, if a channel running MixMonitor was transferred by another party, then the recording would stop once the transfer had completed. By using AUDIOHOOK_INHERIT, you can make MixMonitor continue recording the call even after the transfer has completed. It has also been determined that since this is seen by most as a bug fix and is not an invasive change, this functionality will also be backported to 1.4 and merged into the 1.6.0 branches, even though they are feature-frozen. (closes issue #13538) Reported by: mbit Patches: 13538.patch uploaded by putnopvut (license 60) Tested by: putnopvut Review: http://reviewboard.digium.com/r/102/ ........ r166095 | mmichelson | 2008-12-19 16:40:57 -0600 (Fri, 19 Dec 2008) | 5 lines Remove the verbatim tag from the author line I could have sworn I already did that before, though... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@166098 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-11Merged revisions 163254 via svnmerge from russell2-22/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r163254 | russell | 2008-12-11 15:48:08 -0600 (Thu, 11 Dec 2008) | 16 lines Merged revisions 163253 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r163253 | russell | 2008-12-11 15:46:29 -0600 (Thu, 11 Dec 2008) | 8 lines Fix some observed slowdowns in dialplan processing. The change is to remove autoservice usage from dialplan functions that do not need it because they do not perform operations that potentially block. (closes issue #13940) Reported by: tbelder ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@163256 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-04Merged revisions 160856 via svnmerge from rmudgett1-6/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r160856 | rmudgett | 2008-12-03 19:36:39 -0600 (Wed, 03 Dec 2008) | 1 line Jcolp pointed out that num will also match number ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@160859 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-04Merged revisions 160854 via svnmerge from rmudgett1-13/+20
https://origsvn.digium.com/svn/asterisk/trunk ........ r160854 | rmudgett | 2008-12-03 19:14:22 -0600 (Wed, 03 Dec 2008) | 4 lines * Found a couple more places where num/number needed to be done so 1.4 upgraders will not have problems. * Added curly braces and minor tweaks. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@160858 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-03Merged revisions 160760 via svnmerge from murf1-3/+17
https://origsvn.digium.com/svn/asterisk/trunk ................ r160760 | murf | 2008-12-03 14:09:15 -0700 (Wed, 03 Dec 2008) | 23 lines Merged revisions 160703 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r160703 | murf | 2008-12-03 13:41:42 -0700 (Wed, 03 Dec 2008) | 11 lines (closes issue #13597) Reported by: john8675309 Patches: patch.13597 uploaded by murf (license 17) Tested by: murf, john8675309 This patch causes the setcid func to update the CDR clid after setting the channel field. I also notice that in trunk, the num/number of 1.4 is left out; I decided to include the option to use either in trunk, so as not to have 1.4 upgraders not to have problems. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@160766 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-29Merged revisions 159818 via svnmerge from kpfleming1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r159818 | kpfleming | 2008-11-29 11:57:39 -0600 (Sat, 29 Nov 2008) | 18 lines incorporates r159808 from branches/1.4: ------------------------------------------------------------------------ r159808 | kpfleming | 2008-11-29 10:58:29 -0600 (Sat, 29 Nov 2008) | 7 lines update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them format attributes in a consistent way ------------------------------------------------------------------------ in addition: move some format attributes from main/utils.c to the header files they belong in, and fix up references to the relevant functions based on new compiler warnings ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@159851 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155395 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r155395 | tilghman | 2008-11-07 16:03:50 -0600 (Fri, 07 Nov 2008) | 2 lines Two bugs relating to colnames found by Marquis42 on #asterisk-dev ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155396 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-03Recorded merge of revisions 154023 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r154023 | tilghman | 2008-11-03 15:01:30 -0600 (Mon, 03 Nov 2008) | 4 lines Should have passed the string pointer, not the ast_str structure. (closes issue #13830) Reported by: Marquis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@154024 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-02import gcc 4.3.2 warning fixes from trunk, with a few changes specific to ↵kpfleming1-24/+40
this branch git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@153710 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-26Merged revisions 152060 via svnmerge from seanbright1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r152060 | seanbright | 2008-10-26 16:25:08 -0400 (Sun, 26 Oct 2008) | 15 lines Merged revisions 152059 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152059 | seanbright | 2008-10-26 16:23:36 -0400 (Sun, 26 Oct 2008) | 7 lines Since passing \0 as the second argument to strchr is valid (and will match the trailing \0 of a string) we need to check that first, otherwise we end up with incorrect results. Fix suggested by reporter. (closes issue #13787) Reported by: meitinger ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152068 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-15Merged revisions 149687 via svnmerge from tilghman1-25/+36
https://origsvn.digium.com/svn/asterisk/trunk ........ r149687 | tilghman | 2008-10-15 14:07:39 -0500 (Wed, 15 Oct 2008) | 7 lines Permit data fields to contain more than 255 characters. (closes issue #13631) Reported by: seanbright Patches: 20081015__bug13631.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149688 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-15Merged revisions 149640 via svnmerge from tilghman1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r149640 | tilghman | 2008-10-15 12:16:00 -0500 (Wed, 15 Oct 2008) | 2 lines Only set buf to blank before the goto. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149641 f38db490-d61c-443f-a65b-d21fe96a405b