Commit Graph

508 Commits

Author SHA1 Message Date
Russell Bryant f8483a0d04 Do a massive conversion for using the ast_verb() macro
(closes issue #10277, patches by mvanbaak)

Basically, this changes ...

if (option_verbose > 2)
   ast_verbose(VERBOSE_PREFIX_3, "Something\n");

to ...

ast_verb(3, "Something\n");


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-26 15:49:18 +00:00
Steve Murphy f7213d2411 The upgrade of application argument separators to comma has an effect on AEL; I commented out the code that substitutes commas with vertbars, so we can get apps to parse their args correctly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-26 01:33:55 +00:00
Tilghman Lesher 55b1ee298e Merge the dialplan_aesthetics branch. Most of this patch simply converts applications
using old methods of parsing arguments to using the standard macros.  However, the big
change is that the really old way of specifying application and arguments separated by
a comma will no longer work (e.g. NoOp,foo|bar).  Instead, the way that has been
recommended since long before 1.0 will become the only method available (e.g. NoOp(foo,bar).


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-23 19:51:41 +00:00
Steve Murphy 0e969271ae After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 23:24:27 +00:00
Steve Murphy 5ac24b25d3 This corrects the problem with flags and %lld formats on 64-bit machines, where uint64_t is NOT acceptable for %lld, and also works on 32-bit machines. At least, with gcc.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 14:35:07 +00:00
Joshua Colp 674dbeb0cf Merged revisions 75583 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r75583 | file | 2007-07-18 11:18:53 -0300 (Wed, 18 Jul 2007) | 5 lines

(closes issue #10224)
Reported by: irroot

Record the threadid of each running thread before shutting them down as the thread themselves may change the value.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 14:20:19 +00:00
Joshua Colp 4003b31fc5 Minor code tweaks. Variables were being checked wrong in some situations and didn't need to be checked in others.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 13:59:01 +00:00
Steve Murphy 8b0b74c9b0 Spotted this bug today myself, trying to reproduce a BE bug. Use a vert bar instead of a comma, when calling RAND.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17 21:52:51 +00:00
Steve Murphy 8a7732f067 via 10206, I have added an option (e) to Dial to allow the h exten to get run on peer. Had to upgrade ast_flag stuff to 64 bits to do this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17 19:40:29 +00:00
Joshua Colp 1040d3f64b Clean up pbx_spool. So many nested if statements...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-11 20:40:33 +00:00
Joshua Colp 836ea36d3c Merged revisions 74045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r74045 | file | 2007-07-09 11:49:05 -0300 (Mon, 09 Jul 2007) | 2 lines

Few minor thread synchronization tweaks. (issue #10124 reported by gzero)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-09 14:50:04 +00:00
Joshua Colp d61056132a Merged revisions 73930 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73930 | file | 2007-07-08 22:13:57 -0300 (Sun, 08 Jul 2007) | 2 lines

Add a few sanity checks when writing out the dialplan. (issue #10157 reported by dome)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-09 01:17:28 +00:00
Steve Murphy 6a4efe5d5a In regards to changes for 9508, expr2 system choking on floating point numbers, I'm adding this update to round out (no pun intended) and make this FP-capable version of the Expr2 stuff interoperate better with previous integer-only usage, by providing Functions syntax, with 20 builtin functions for floating pt to integer conversions, and some general floating point math routines that might commonly be used also. Along with this, I made it so if a function was not a builtin, it will try and find it in the ast_custom_function list, and if found, execute it and collect the results. Thus, you can call system functions like CDR(), CHANNEL(), etc, from within $\[..\] exprs, without having to wrap them in $\{...\} (curly brace) notation. Did a valgrind on the standalone and made sure there's no mem leaks. Looks good. Updated the docs, too.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-05 18:15:22 +00:00
Russell Bryant 3b0f89dae6 Merged revisions 72806 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r72806 | russell | 2007-07-01 18:52:45 -0500 (Sun, 01 Jul 2007) | 13 lines

Merged revisions 72805 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r72805 | russell | 2007-07-01 18:51:34 -0500 (Sun, 01 Jul 2007) | 5 lines

When appending lines to call files to keep track of retries, write a leading
newline just in case the original call file did not have a newline at the end.
This fix is in response to a problem I saw reported on the asterisk-users
mailing list.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-01 23:53:13 +00:00
Russell Bryant 8d89f741a5 Merged revisions 72272 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r72272 | russell | 2007-06-27 16:08:34 -0500 (Wed, 27 Jun 2007) | 13 lines

Merged revisions 72267 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r72267 | russell | 2007-06-27 16:06:45 -0500 (Wed, 27 Jun 2007) | 5 lines

Fix a minor issue with parsing the priority number.  You could have as much
whitespace as you want around a numeric priority, but you couldn't have any
whitespace around a special priority like "n" or "hint".
(issue #10039, reported by mitheloc, fixed by me)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-27 21:09:24 +00:00
Joshua Colp 36668045a6 Merged revisions 72006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72006 | file | 2007-06-26 20:58:35 -0400 (Tue, 26 Jun 2007) | 2 lines

Make unloading of pbx_dundi actually work.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-27 01:00:47 +00:00
Tilghman Lesher a1bc823136 Issue 9990 - New API ast_mkdir, which creates parent directories as necessary (and is faster than an outcall to mkdir -p)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-22 04:35:12 +00:00
Steve Murphy c1bb0fc34b This finishes the changes for making Macro args LOCAL to the call, and allowing users to declare local variables.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-20 20:10:19 +00:00
Tilghman Lesher 704c756c4a Merge work to make U(...) option work for Dial
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-20 17:35:08 +00:00
Russell Bryant 9e0458e9f1 Completely remove all of the code related to jumping to priority n + 101. yay!
(issue #9926, caio1982)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-12 15:58:28 +00:00
Tilghman Lesher 7e52b8620b Merged revisions 68595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68595 | tilghman | 2007-06-10 23:21:30 -0500 (Sun, 10 Jun 2007) | 2 lines

"dialplan save" produced garbage in the config file

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-11 04:28:08 +00:00
Steve Murphy 52efde5c65 Merged revisions 67526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67526 | murf | 2007-06-05 15:30:18 -0600 (Tue, 05 Jun 2007) | 1 line

this fixes bug 9883, wherein macros were not allowing the includes construct. fixed and tested, looks OK. Now includes can serve as an adjunct to catch.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-05 22:04:22 +00:00
Steve Murphy 00b33aaa49 Merged revisions 67420 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67420 | murf | 2007-06-05 12:17:28 -0600 (Tue, 05 Jun 2007) | 1 line

Added code to automatically add a default case to switches that don't have one. In some cases, rather than fall thru, it results in a goto with -1 result, which terminates the extension; a sort of dialplan seqfault, sort of. This was required to fix bug reported in 9881
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-05 18:23:53 +00:00
Russell Bryant e1375b96c2 Change javadoc style code documentation to the same format we use elsewhere.
(issue #9864, patch from snuffy)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-04 15:56:13 +00:00
Kevin P. Fleming 4573b36af1 use the OpenSSL AES implementation if it's available (unless configured not to)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 22:07:50 +00:00
Russell Bryant 4b3a3fb14c Add a new API call for creating detached threads. Then, go replace all of the
places in the code where the same block of code for creating detached threads
was replicated.  (patch from bbryant)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 18:30:19 +00:00
Russell Bryant f02e26feff Make sure that DUNDIRESULT is given an ID.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-15 22:57:01 +00:00
Steve Murphy dc8f6a9473 Merged revisions 62883 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62883 | murf | 2007-05-03 07:54:56 -0600 (Thu, 03 May 2007) | 1 line

These mods fix bug 9623, where an '@' in the eswitch contents causes a syntax error. I also updated the regressions.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-03 14:24:00 +00:00
Russell Bryant b419fc1134 Add support for setting the CoS for VLAN traffic (802.1p) in Linux. The
file doc/qos.tex has been updated to document the new functionality.
(issue #9540, patch submitted by IgorG)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 16:16:26 +00:00
Russell Bryant c59b8876aa Merge changes from team/russell/dundi_results
This introduces two new dialplan functions: DUNDIQUERY and DUNDIRESULT.
DUNDIQUERY lets you intitiate a DUNDi query from the dialplan.  Then,
DUNDIRESULT will let you find out how many results there are, and access each
one without having to the query again.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-28 19:52:37 +00:00
Steve Murphy f120c26ec1 Merged revisions 59688 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59688 | murf | 2007-04-02 11:31:32 -0600 (Mon, 02 Apr 2007) | 1 line

continue in for-loop should go to the incrementer, not the test. As per 9435, thanks to marcelbarbulescu
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59692 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-02 17:38:12 +00:00
Steve Murphy e1476b8aab Merged revisions 59261 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59261 | murf | 2007-03-27 12:16:32 -0600 (Tue, 27 Mar 2007) | 1 line

via 9373 (duplicate context in AEL crashes asterisk), kpfleming pointed on asterisk-dev, that DECLINE in this case the proper thing to do. This change now has it doing the proper thing.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-27 18:21:50 +00:00
Steve Murphy 2ca78b4a6e added the no. 18 regression test
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-26 22:24:16 +00:00
Steve Murphy 589a8f9214 updated the regressions with regards to 9373, the crash on double contexts, and brought other regressions up to date
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-26 22:17:37 +00:00
Steve Murphy 3433b64703 Merged revisions 59228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59228 | murf | 2007-03-26 15:41:32 -0600 (Mon, 26 Mar 2007) | 1 line

fix for 9373 (duplicate context in AEL crashes asterisk). I turned a duplicate context from a WARNING to an ERROR. Now you get a module load failure, and asterisk just exits. That's better than a crash, right\?
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-26 21:47:37 +00:00
Steve Murphy 834f783edf Merged revisions 59206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59206 | murf | 2007-03-26 11:38:29 -0600 (Mon, 26 Mar 2007) | 1 line

A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-26 17:56:26 +00:00
Joshua Colp 133f26f977 Merged revisions 59200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59200 | file | 2007-03-26 11:16:29 -0400 (Mon, 26 Mar 2007) | 2 lines

Have ast_copy_string magically appear in the aelparse binary! DONT_OPTIMIZE should now work once again.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-26 15:20:17 +00:00
Steve Murphy e6d32d3132 The fix for the AEL <<security hole>> (bug 9316) is here...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-20 18:18:06 +00:00
Russell Bryant 32e03f9e4a Add the ability to dynamically specify weights for responses to DUNDi queries.
This can be done using a global variable or a dialplan function.  Using the
SHELL() function will allow you to use an external script to determine what the
weight in the response should be.  This can be very useful in load balancing
applications.
(inspired by discussions with blitzrage and jsmith in #asterisk-bugs)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-07 22:30:52 +00:00
Steve Murphy 67df5b67ee updated the regression tests
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-03 15:35:44 +00:00
Steve Murphy 91a9b97a73 Merged revisions 57426 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57426 | murf | 2007-03-01 22:21:36 -0700 (Thu, 01 Mar 2007) | 1 line

I almost had comma escapes right, but 9184 points out the problem-- the escape is removed by pbx_config, and pbx_ael should also, before sending it down into the pbx engine. Also, you have to insert it back in, if you are generating extensions.conf code from the AEL.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-02 05:57:06 +00:00
Joshua Colp e7b03a991e Convert the PBX core to use read/write locks. This yields a nifty performance improvement when it comes to simultaneous calls going through the dialplan. Using murf's test the old mutex based core took an average of 57.3 seconds while the rwlock based core took 31.1 seconds. That's a nifty 26.2 seconds performance improvement. The other good part is that if we do need to switch back then we just have to change the lock/unlock API calls. I converted everywhere that used to touch the mutex locks directly to use them.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 20:46:01 +00:00
Steve Murphy bca20ed71e Merged revisions 57049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57049 | murf | 2007-02-28 10:15:27 -0700 (Wed, 28 Feb 2007) | 1 line

I was surprised that I had not yet downgraded missing goto targets and macro call defs to a warning, in case they are in extensions.conf; I rectified this problem. Also, A goto in a macro to a target in a catch block was not being found; I fixed this too; the cause was that I needed to treat catch statements like an extension in the find_match code.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 17:22:45 +00:00
Joshua Colp e83cff1c23 Merged revisions 56856 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r56856 | file | 2007-02-26 15:07:18 -0500 (Mon, 26 Feb 2007) | 10 lines

Merged revisions 56850 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r56850 | file | 2007-02-26 15:05:02 -0500 (Mon, 26 Feb 2007) | 2 lines

Obey the clearglobalvars option in extensions reload (or dialplan reload depending on your version). (issue #9146 reported by ramonpeek)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-26 20:09:06 +00:00
Olle Johansson 75d387acbc Doxygen additions, corrections
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-24 20:29:41 +00:00
Kevin P. Fleming 74f31a51bc add -Wundef to the --enable-dev-mode flags, so that mistyped macro names in #if expressions will be caught
convert various #if expressions to #ifdef for macros that may not be defined (and where the value is not important)
Note: two of these changes are in bison generated files which is going to be inconvenient when they are regenerated


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-18 15:03:42 +00:00
Russell Bryant 84718d10c4 Merged revisions 54898 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54898 | russell | 2007-02-16 12:03:41 -0600 (Fri, 16 Feb 2007) | 4 lines

Fix setting "autofallthrough" to yes by default.  It was set to enabled in
pbx.c.  However, if the option was not present in extensions.conf, then
pbx_config.c would set it back to disabled.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 18:04:34 +00:00
Russell Bryant b233892198 Merged revisions 53046 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r53046 | russell | 2007-01-31 15:32:08 -0600 (Wed, 31 Jan 2007) | 11 lines

Merged revisions 53045 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines

Fix a bunch of places where pthread_attr_init() was called, but
pthread_attr_destroy() was not.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-31 21:35:15 +00:00
Tilghman Lesher a3ce6f5f8c Merged revisions 52679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r52679 | tilghman | 2007-01-29 16:12:12 -0600 (Mon, 29 Jan 2007) | 2 lines

Argument number correction

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-29 22:13:56 +00:00
Steve Murphy 85f65b1ff0 Merged revisions 51409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51409 | murf | 2007-01-22 12:28:51 -0700 (Mon, 22 Jan 2007) | 1 line

This fixes 8836, according to dnatural
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-22 19:42:28 +00:00