aboutsummaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)AuthorFilesLines
2008-09-06Merged revisions 141504 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r141504 | tilghman | 2008-09-06 10:26:45 -0500 (Sat, 06 Sep 2008) | 12 lines Merged revisions 141503 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141503 | tilghman | 2008-09-06 10:23:42 -0500 (Sat, 06 Sep 2008) | 4 lines Reverting behavior change (AGI should not exit non-zero on SUCCESS) (closes issue #13434) Reported by: francesco_r ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141505 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-04Merged revisions 141115 via svnmerge from murf2-434/+860
https://origsvn.digium.com/svn/asterisk/trunk ................ r141115 | murf | 2008-09-04 17:31:41 -0600 (Thu, 04 Sep 2008) | 78 lines Merged revisions 141094 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141094 | murf | 2008-09-04 17:15:07 -0600 (Thu, 04 Sep 2008) | 70 lines (closes issue #13357) Reported by: pj Tested by: murf (closes issue #13416) Reported by: yarns Tested by: murf If you find this message overly verbose, relax, it's probably not meant for you. This message is meant for probably only two people in the whole world: me, or the poor schnook that has to maintain this code because I'm either dead or unavailable at the moment. This fix solves two reports, both having to do with embedding a function call in a ${} construct. It was tricky because the funccall syntax has parenthesis () in it. And up till now, the 'word' token in the flex stuff didn't allow that, because it would tend to steal the LP and RP tokens. To be truthful, the "word" token was the trickiest, most unstable thing in the whole lexer. I was lucky it made this long without complaints. I had to choose every character in the pattern with extreme care, and I knew that someday I'd have to revisit it. Well, the day has come. So, my brilliant idea (and I'm being modest), was to use the surrounding ${} construct to make a state machine and capture everything in it, no matter what it contains. But, I have to now treat the word token like I did with comments, in that I turn the whole thing into a state-machine sort of spec, with new contexts "curlystate", "wordstate", and "brackstate". Wait a minute, "brackstate"? Yes, well, it didn't take very many regression tests to point out if I do this for ${} constructs, I also have to do it with the $[] constructs, too. I had to create a separate pcbstack2 and pcbstack3 because these constructs can occur inside macro argument lists, and when we have two state machines operating on the same structures we'd get problems otherwise. I guess I could have stopped at pcbstack2 and had the brackstate stuff share it, but it doesn't hurt to be safe. So, the pcbpush and pcbpop routines also now have versions for "2" and "3". I had to add the {KEYWORD} construct to the initial pattern for "word", because previously word would match stuff like "default7", because it was a longer match than the keyword "default". But, not any more, because the word pattern only matches only one or two characters now, and it will always lose. So, I made it the winner again by making an optional match on any of the keywords before it's normal pattern. I added another regression test to make sure we don't lose this in future edits, and had to fix just one regression, where it no longer reports a 'cascaded' error, which I guess is a plus. I've given some thought as to whether to apply these fixes to 1.4 and the 1.6.x releases, vs trunk; I decided to put it in 1.4 because one of the bug reports was against 1.4; and it is unexpected that AEL cannot handle this situation. It actually reduced the amount of useless "cascade" error messages that appeared in the regressions (by one line, ehhem). There is a possible side-effect in that it does now do more careful checking of what's in those ${} constructs, as far as matching parens, and brackets are concerned. Some users may find a an insidious problem and correct it this way. This should be exceedingly rare, I hope. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141116 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-04Merged revisions 141039 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r141039 | jpeeler | 2008-09-04 12:27:56 -0500 (Thu, 04 Sep 2008) | 15 lines Merged revisions 141028 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines (closes issue #11979) Fixes multiple parking problems: Crash when executing a park on an extension dialed by AGI due to not returning the proper return code. Crash when using a builtin feature that was a subset of a enabled dynamic feature. Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141086 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138845 via svnmerge from murf3-251/+255
https://origsvn.digium.com/svn/asterisk/trunk ........ r138845 | murf | 2008-08-19 10:31:24 -0600 (Tue, 19 Aug 2008) | 1 line Oops. put a decl in a generated file. My bad, but fixed now. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138847 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-19Merged revisions 138815 via svnmerge from murf3-288/+321
https://origsvn.digium.com/svn/asterisk/trunk ........ r138815 | murf | 2008-08-19 09:59:12 -0600 (Tue, 19 Aug 2008) | 19 lines These changes are in regards to bug 13249, where users are being surprised by the changes made to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x installation where a "make samples" was executed, or where they hand-edited the asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher). (this commit does not totally solve 13249, at least not yet) The change involves issueing a single warning while the AEL file is loading, if: 1. app_set is present in the config file, and set to 1.6 or higher. 2. there are double quotes in an assignment statement (eg x = "hi there";) 3. the warning was not already issued. The standalone app, aelparse, does not (yet) issue this warning. I'd have to have it read in the asterisk.conf file, and that's a bit of hassle. I'll add it if users request it, tho. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138846 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-11Merged revisions 137150 via svnmerge from tilghman1-3/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r137150 | tilghman | 2008-08-10 19:25:28 -0500 (Sun, 10 Aug 2008) | 13 lines Merged revisions 137138 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r137138 | tilghman | 2008-08-10 19:20:38 -0500 (Sun, 10 Aug 2008) | 5 lines Deallocate database connection handle on disconnect, as we allocate another one on connect. (closes issue #13271) Reported by: dveiga ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@137160 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-09Merged revisions 136859 via svnmerge from tilghman1-16/+23
https://origsvn.digium.com/svn/asterisk/trunk ........ r136859 | tilghman | 2008-08-08 20:15:38 -0500 (Fri, 08 Aug 2008) | 4 lines Update documentation as to the behavior of AGI in 1.6.0 and higher. Also, add an OOB message that answers the question of, if AGI no longer shuts down the connection on hangup, how will FastAGI know when to stop processing the call? ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136860 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-08Merged revisions 136746 via svnmerge from murf1-16/+339
https://origsvn.digium.com/svn/asterisk/trunk ................ r136746 | murf | 2008-08-07 18:48:35 -0600 (Thu, 07 Aug 2008) | 40 lines Merged revisions 136726 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r136726 | murf | 2008-08-07 18:15:34 -0600 (Thu, 07 Aug 2008) | 32 lines (closes issue #13236) Reported by: korihor Wow, this one was a challenge! I regrouped and ran a new strategy for setting the ~~MACRO~~ value; I set it once per extension, up near the top. It is only set if there is a switch in the extension. So, I had to put in a chunk of code to detect a switch in the pval tree. I moved the code to insert the set of ~~exten~~ up to the beginning of the gen_prios routine, instead of down in the switch code. I learned that I have to push the detection of the switches down into the code, so everywhere I create a new exten in gen_prios, I make sure to pass onto it the values of the mother_exten first, and the exten next. I had to add a couple fields to the exten struct to accomplish this, in the ael_structs.h file. The checked field makes it so we don't repeat the switch search if it's been done. I also updated the regressions. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136778 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-06Merged revisions 136005 via svnmerge from oej1-39/+52
https://origsvn.digium.com/svn/asterisk/trunk ........ r136005 | oej | 2008-08-06 15:34:08 +0200 (Ons, 06 Aug 2008) | 6 lines - Formatting - Changing debug messages from VERBOSE to DEBUG channel - Adding a few todo's - Adding a few more "XMPP"'s to compliment Jabber... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@136006 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31Merged revisions 134977 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r134977 | tilghman | 2008-07-31 16:53:59 -0500 (Thu, 31 Jul 2008) | 2 lines Switch command order, to meet with current specs ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134979 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30Merged revisions 134481 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r134481 | tilghman | 2008-07-30 14:05:35 -0500 (Wed, 30 Jul 2008) | 13 lines Merged revisions 134480 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r134480 | tilghman | 2008-07-30 14:03:44 -0500 (Wed, 30 Jul 2008) | 5 lines launch_netscript sometimes returns -1, which fails to set AGISTATUS. Map failure to -1, so that AGISTATUS is always set. (closes issue #13199) Reported by: smw1218 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134482 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-19Merged revisions 132277 via svnmerge from mvanbaak1-10/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r132277 | mvanbaak | 2008-07-19 12:46:12 +0200 (Sat, 19 Jul 2008) | 7 lines fix a couple of comments in sqlite resource driver. (closes issue #13110) Reported by: gknispel_proformatique Patches: res_config_sqlite_comments.patch uploaded by gknispel (license 261) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@132278 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Merged revisions 131753 via svnmerge from tilghman1-0/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r131753 | tilghman | 2008-07-17 13:36:34 -0500 (Thu, 17 Jul 2008) | 6 lines Fix memory leaks (closes issue #13099) Reported by: gknispel_proformatique Patches: res_config_sqlite_leak_on_error.patch uploaded by gknispel (license 261) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131754 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-17Merged revisions 131681 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r131681 | tilghman | 2008-07-17 10:45:25 -0500 (Thu, 17 Jul 2008) | 4 lines Fix memory leak. (Closes issue #13096) Reported by gknispel_proformatique ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131682 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131361 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r131361 | mmichelson | 2008-07-16 14:57:02 -0500 (Wed, 16 Jul 2008) | 9 lines Don't try to dereference the dbfile pointer if we know that it's NULL. (closes issue #13092) Reported by: gknispel_proformatique Patches: trunk_sqlite_check_vars_null.patch uploaded by gknispel (license 261) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131362 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-16Merged revisions 131243 via svnmerge from murf1-6/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r131243 | murf | 2008-07-16 11:59:33 -0600 (Wed, 16 Jul 2008) | 27 lines Merged revisions 131242 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131242 | murf | 2008-07-16 11:53:43 -0600 (Wed, 16 Jul 2008) | 19 lines (closes issue #13090) Reported by: murf The problem was that, esoteric as it is, because the hangerupper context immediately preceded the std-priv-extent macro, that the checking code accidentally would fall from traversing hangerupper into the std-priv-exten macro, where it would hit the hangerupper in the 'includes', and proceed into an infinite recursion. A small fix to traverse into the statements of the context instead of the context solves this issue. I also added some commented out printfs for debug, which were pretty handy in the face of a dorky gdb. This was a problem around since the package was first written; but evidently pretty rare in turning up in the field. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131248 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 131072 via svnmerge from russell1-2/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r131072 | russell | 2008-07-15 13:46:40 -0500 (Tue, 15 Jul 2008) | 5 lines Fix a couple of places in res_agi where the agi_commands lock would not be released, causing a deadlock. (Reported by mvanbaak in #asterisk-dev, discovered by bbryant's change to the lock tracking code to yell at you if a thread exits with a lock still held) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131073 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-15Merged revisions 130145 via svnmerge from murf6-325/+332
https://origsvn.digium.com/svn/asterisk/trunk Merging this rev from trunk to 1.6.0 was not simple. Why? Because we've enhanced trunk to do a [fast] merge-and-delete operation which also solved problems with contexts having entries from different registrars. Fast as in the amount of time the contexts are locked down. That *is* fast, but traversing the entire dialplan looking for priorities to delete takes more time overall. This particular fix involved pulling in those enhancements from trunk, along with all the various fixes and refinements made along the way. Merging all this from trunk into 1.6 involved: a. mergetrunk6 in the stuff from 130145; b. revert all but the prop changes c. catalog all revisions to pbx.c since 1.6.0 was forked (at rev 105596). d. catalog all revisions to pbx.c in trunk since 1.6.0 was forked, making special note of all revs that were not merged into 1.6.0. e. study each rev in trunk not applied to 1.6.0, and determine if it was involved in the merge_and_delete enhancements in trunk. 25 commits were done in 1.6.0, all but one (106306) was a merge from trunk. Trunk had 22 additional changes, of which 7 were involved in the merge_and_delete enhancements: 106757 108894 109169 116461 123358 130145 130297 f. Go to trunk and collect patches, one by one, of the changes made by each rev across the entire source tree, using svn diff -c <num> > pfile g. Apply each patch in order to 1.6.0, and resolve all failures and compilation problems before proceding to the next patch. h. test the stuff. i. profit! ........ r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines (closes issue #13041) Reported by: eliel Tested by: murf (closes issue #12960) Reported by: mnicholson In this 'omnibus' fix, I **think** I solved both the problem in 13041, where unloading pbx_ael.so caused crashes, or incomplete removal of previous registrar'ed entries. And I added code to completely remove all includes, switches, and ignorepats that had a matching registrar entry, which should appease 12960. I also added a lot of seemingly useless brackets around single statement if's, which helped debug so much that I'm leaving them there. I added a routine to check the correlation between the extension tree lists and the hashtab tables. It can be amazingly helpful when you have lots of dialplan stuff, and need to narrow down where a problem is occurring. It's ifdef'd out by default. I cleaned up the code around the new CIDmatch code. It was leaving hanging extens with bad ptrs, getting confused over which objects to remove, etc. I tightened up the code and changed the call to remove_exten in the merge_and_delete code. I added more conditions to check for empty context worthy of deletion. It's not empty if there are any includes, switches, or ignorepats present. If I've missed anything, please re-open this bug, and be prepared to supply example dialplan code. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130946 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-13Merged revisions 130578 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r130578 | mvanbaak | 2008-07-14 01:14:03 +0200 (Mon, 14 Jul 2008) | 15 lines Make all sed calls Posix sed compatible. To make sure nobody commits script-modified files we first make a backup of asterisk.tex, run the script, generate the pdf and / or html, and put the original asterisk.tex back. This will guard us for the stuff that happened before that someone committed a locally modified asterisk.tex, with changes done by this script. (closes issue #13062) Reported by: mvanbaak Patches: sed_without-i-v3.diff uploaded by mvanbaak (license 7) Tested by: mvanbaak Feedback from Corydon. Thanks for taking the time to go through this. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130582 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11Merged revisions 129864 via svnmerge from seanbright2-17/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r129864 | seanbright | 2008-07-10 20:55:06 -0400 (Thu, 10 Jul 2008) | 1 line Fix some usages of snprintf, and clarify a couple variable names. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129865 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-10Merged revisions 129758 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r129758 | tilghman | 2008-07-10 16:23:23 -0500 (Thu, 10 Jul 2008) | 10 lines Merged revisions 129741 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r129741 | tilghman | 2008-07-10 16:19:48 -0500 (Thu, 10 Jul 2008) | 2 lines Oops ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129764 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-08Merged revisions 129045 via svnmerge from bbryant1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r129045 | bbryant | 2008-07-08 11:40:28 -0500 (Tue, 08 Jul 2008) | 7 lines Janitor project to convert sizeof to ARRAY_LEN macro. (closes issue #13002) Reported by: caio1982 Patches: janitor_arraylen5.diff uploaded by caio1982 (license 22) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129046 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125703 via svnmerge from phsultan1-14/+18
https://origsvn.digium.com/svn/asterisk/trunk ........ r125703 | phsultan | 2008-06-27 09:28:17 +0200 (Fri, 27 Jun 2008) | 1 line Fix a compile time error that occurs if OpenSSL is not installed. Reported by Noel Morais on the users mailing list ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125704 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-26Merged revisions 125279 via svnmerge from kpfleming1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r125279 | kpfleming | 2008-06-26 07:09:24 -0500 (Thu, 26 Jun 2008) | 2 lines fix compile failure found by buildbot (go, buildbot!) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125280 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-25Merged revisions 125138 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r125138 | kpfleming | 2008-06-25 18:05:28 -0500 (Wed, 25 Jun 2008) | 18 lines Merged revisions 125132 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it get app_rpt building again after the DAHDI changes (closes issue #12911) Reported by: tzafrir ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125146 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24Merged revisions 124872 via svnmerge from phsultan1-20/+27
https://origsvn.digium.com/svn/asterisk/trunk ........ r124872 | phsultan | 2008-06-24 19:50:22 +0200 (Tue, 24 Jun 2008) | 6 lines Subscribe to buddy's presence only if we really need to. That is, if the corresponding roster item has a subscription value set to "none" or "from". Make the code more readable. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124873 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-24Merged revisions 124870 via svnmerge from phsultan1-29/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r124870 | phsultan | 2008-06-24 19:28:39 +0200 (Tue, 24 Jun 2008) | 1 line Code simplification ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124871 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-21Merged revisions 124505 via svnmerge from tilghman1-7/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r124505 | tilghman | 2008-06-21 07:53:48 -0500 (Sat, 21 Jun 2008) | 4 lines Reduce warning to debug, otherwise we flood the log when we (legitimately) can't find a record. (Closes issue #12908) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124506 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-19Merged revisions 123952 via svnmerge from tilghman1-41/+44
https://origsvn.digium.com/svn/asterisk/trunk ........ r123952 | tilghman | 2008-06-19 12:22:27 -0500 (Thu, 19 Jun 2008) | 6 lines Don't change pointers that need to be later passed back for deallocation. (closes issue #12572) Reported by: flyn Patches: 20080613__bug12572.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123958 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-17Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. ↵jpeeler1-12/+12
Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123332 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05Merged revisions 120676 via svnmerge from phsultan1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r120676 | phsultan | 2008-06-05 19:02:39 +0200 (Thu, 05 Jun 2008) | 10 lines Merged revisions 120675 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r120675 | phsultan | 2008-06-05 18:56:15 +0200 (Thu, 05 Jun 2008) | 2 lines Ignore appended resource when comparing JIDs. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120677 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05Merged revisions 120602 via svnmerge from tilghman1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r120602 | tilghman | 2008-06-05 10:58:11 -0500 (Thu, 05 Jun 2008) | 4 lines Conditionally load the AGI command gosub, depending on whether or not res_agi has been loaded, fix a return value in the loader, and ensure that the help workhorse header does not print on load. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120603 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03Merged revisions 120171 via svnmerge from tilghman1-1/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r120171 | tilghman | 2008-06-03 17:05:16 -0500 (Tue, 03 Jun 2008) | 5 lines Move compatibility options into asterisk.conf, default them to on for upgrades, and off for new installations. This includes the translation from pipes to commas for pbx_realtime and the EXEC command for AGI, as well as the change to the Set application not to support multiple variables at once. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120172 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03Merged revisions 119930 via svnmerge from murf1-6/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r119930 | murf | 2008-06-03 09:07:20 -0600 (Tue, 03 Jun 2008) | 24 lines Merged revisions 119929 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r119929 | murf | 2008-06-03 08:49:46 -0600 (Tue, 03 Jun 2008) | 16 lines as per http://lists.digium.com/pipermail/asterisk-users/2008-June/212934.html, which is a message from Philipp Kempgen, requesting that the WARNING that an extension is empty be reduced to a NOTICE or less, as empty extensions are syntactically possible, and no big deal. With which I agree, and have removed that WARNING message entirely. I think it is not necessary to see this message. It didn't state that a NoOp() was inserted automatically on your behalf, and really, as users, who cares? Why freak out dialplan writers with unnecessary warnings? The details of the machinations a compiler goes thru to produce working assembly code is of little interest to most programmers-- we will follow the unix principal of doing our work silently. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119931 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-02Merged revisions 119741 via svnmerge from phsultan1-4/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r119741 | phsultan | 2008-06-02 16:35:24 +0200 (Mon, 02 Jun 2008) | 13 lines Do not link the guest account with any configured XMPP client (in jabber.conf). The actual connection is made when a call comes in Asterisk. Apply this fix to Jingle too. Fix the ast_aji_get_client function that was not able to retrieve an XMPP client from its JID. (closes issue #12085) Reported by: junky Tested by: phsultan ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119743 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-27Merged revisions 118302 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r118302 | tilghman | 2008-05-27 08:30:10 -0500 (Tue, 27 May 2008) | 6 lines When binding anonymously, credentials are still needed. (closes issue #12601) Reported by: suretec Patches: res_config_ldap.c.patch uploaded by suretec (license 70) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@118303 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-23Merged revisions 118129 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r118129 | tilghman | 2008-05-23 13:09:14 -0500 (Fri, 23 May 2008) | 3 lines Protect the object from changing while the 'odbc show' CLI command is running (Closes issue #12704) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@118130 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-23Merged revisions 118020 via svnmerge from phsultan1-3/+34
https://origsvn.digium.com/svn/asterisk/trunk ........ r118020 | phsultan | 2008-05-23 12:33:21 +0200 (Fri, 23 May 2008) | 15 lines - remove whitespaces between tags in received XML packets before giving them to the parser ; - report Gtalk error messages from a buddy to the console. This patch makes Asterisk "Google Jingle" (chan_gtalk) implementation work with Empathy. Note that this is only true for audio streams, not video. Thank you to PH for his great help! (closes issue #12647) Reported by: PH Patches: trunk-12647-1.diff uploaded by phsultan (license 73) Tested by: phsultan, PH ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@118021 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-19Merged revisions 117136 via svnmerge from file1-1/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r117136 | file | 2008-05-19 13:53:33 -0300 (Mon, 19 May 2008) | 14 lines Merged revisions 117135 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r117135 | file | 2008-05-19 13:50:52 -0300 (Mon, 19 May 2008) | 6 lines Use the right pthread lock and condition when waiting. (closes issue #12664) Reported by: tomo1657 Patches: res_smdi.c.patch uploaded by tomo1657 (license 484) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@117137 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-14Merged revisions 116467 via svnmerge from tilghman1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r116467 | tilghman | 2008-05-14 16:39:06 -0500 (Wed, 14 May 2008) | 15 lines Merged revisions 116466 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r116466 | tilghman | 2008-05-14 16:38:09 -0500 (Wed, 14 May 2008) | 7 lines Avoid zombies when the channel exits before the AGI. (closes issue #12648) Reported by: gkloepfer Patches: 20080514__bug12648.diff.txt uploaded by Corydon76 (license 14) Tested by: gkloepfer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@116468 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-14Merged revisions 116350 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r116350 | file | 2008-05-14 15:25:54 -0300 (Wed, 14 May 2008) | 4 lines Make the ldap version setting work without having both version and protocol set. (closes issue #12613) Reported by: suretec ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@116351 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-13Merged revisions 115847 via svnmerge from russell1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r115847 | russell | 2008-05-13 12:14:22 -0500 (Tue, 13 May 2008) | 2 lines Initialize the start time in smdi_msg_wait. Somehow this code got lost in trunk. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115848 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-07Merged revisions 115523 via svnmerge from russell1-5/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r115523 | russell | 2008-05-07 13:33:50 -0500 (Wed, 07 May 2008) | 6 lines Only save a password if a username exists. (closes issue #12600) Reported By: suretec Patch by me ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115524 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-07Merged revisions 115521 via svnmerge from russell1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r115521 | russell | 2008-05-07 13:30:12 -0500 (Wed, 07 May 2008) | 7 lines Use the default that the log output claims will be used for the basedn (closes issue #12599) Reported by: suretec Patches: 12599.patch uploaded by juggie (license 24) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115522 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-06Merged revisions 115419 via svnmerge from qwell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r115419 | qwell | 2008-05-06 14:38:44 -0500 (Tue, 06 May 2008) | 15 lines Merged revisions 115418 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r115418 | qwell | 2008-05-06 14:34:58 -0500 (Tue, 06 May 2008) | 7 lines Switch to using ast_random() rather than just rand(). This does not fix the bug reported, but I believe it is correct. (from issue #12446) Patches: bug_12446.diff uploaded by snuffy (license 35) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115420 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-29Merged revisions 114830 via svnmerge from qwell1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r114830 | qwell | 2008-04-29 12:10:55 -0500 (Tue, 29 Apr 2008) | 9 lines Merged revisions 114829 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114829 | qwell | 2008-04-29 12:08:55 -0500 (Tue, 29 Apr 2008) | 1 line Change warning message to debug, since there are cases where 0 results is perfectly fine. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114831 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-23Merged revisions 114595 via svnmerge from qwell1-17/+36
https://origsvn.digium.com/svn/asterisk/trunk ................ r114595 | qwell | 2008-04-23 13:33:28 -0500 (Wed, 23 Apr 2008) | 16 lines Merged revisions 114594 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114594 | qwell | 2008-04-23 13:28:44 -0500 (Wed, 23 Apr 2008) | 8 lines Fix reload/unload for res_musiconhold module. (closes issue #11575) Reported by: sunder Patches: M11575_14_rev3.diff uploaded by junky (license 177) bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114596 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-21Merged revisions 114320 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r114320 | file | 2008-04-21 11:34:06 -0300 (Mon, 21 Apr 2008) | 6 lines Only print out the error message if ldap_modify_ext_s actually returns an error, and not success. (closes issue #12438) Reported by: gservat Patches: res_config_ldap.c-patch-code uploaded by gservat (license 466) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114321 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-18Merged revisions 114254 via svnmerge from file1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r114254 | file | 2008-04-18 13:11:27 -0300 (Fri, 18 Apr 2008) | 4 lines If the parsing of the config file fails make sure we unlock ldap_lock. (closes issue #12477) Reported by: IgorG ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114255 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-17Merged revisions 114199 via svnmerge from phsultan1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r114199 | phsultan | 2008-04-17 15:46:17 +0200 (Thu, 17 Apr 2008) | 10 lines Merged revisions 114198 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114198 | phsultan | 2008-04-17 15:42:23 +0200 (Thu, 17 Apr 2008) | 2 lines Use keepalives effectively in order diagnose bug #12432. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114200 f38db490-d61c-443f-a65b-d21fe96a405b