Mark Michelson b8318ad040 Merged revisions 187421,187424 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

........
  r187421 | mmichelson | 2009-04-09 12:30:39 -0500 (Thu, 09 Apr 2009) | 21 lines
  
  Fix a crash in res_musiconhold when using cached realtime moh.
  
  The moh_register function links an mohclass and then immediately
  unrefs the class since the container now has a reference. The problem
  with using realtime music on hold is that the class is allocated,
  registered, and started in one fell swoop. The refcounting logic 
  resulted in the count being off by one. The same problem did not
  happen when using a static config because the allocation and registration
  of an mohclass is a separate operation from starting moh. This also did
  not affect non-cached realtime moh because the classes are not registered
  at all.
  
  I also have modified res_musiconhold to use the _t_ variants of the ao2_
  functions so that more info can be gleaned when attempting to trace the
  refcounts. I found this to be incredibly helpful for debugging this issue
  and there's no good reason to remove it.
  
  (closes issue #14661)
  Reported by: sum
........
  r187424 | mmichelson | 2009-04-09 12:34:39 -0500 (Thu, 09 Apr 2009) | 3 lines
  
  Use safe macro practices even though they really aren't necessary.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@187427 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-04-09 17:43:20 +00:00

..

ael

Merged revisions 177286 via svnmerge from

2009-02-19 00:17:44 +00:00

ais

Merged revisions 184630 via svnmerge from

2009-03-27 14:04:56 +00:00

snmp

Merged revisions 174149 via svnmerge from

2009-02-07 16:18:02 +00:00

Makefile

Merged revisions 157974 via svnmerge from

2008-11-20 00:10:33 +00:00

res_adsi.c

All of the res/ stuff (other than res_jabber) from the RSW branch.

2008-08-10 00:47:56 +00:00

res_ael_share.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_agi.c

Merged revisions 184673 via svnmerge from

2009-03-27 15:54:22 +00:00

res_ais.c

Merged revisions 179164 via svnmerge from

2009-02-27 21:48:00 +00:00

res_clioriginate.c

Merged revisions 102378 via svnmerge from

2008-02-05 15:10:36 +00:00

res_config_curl.c

Separate the global initialization routines for cURL into its own separate

2008-06-25 16:00:54 +00:00

res_config_ldap.c

All of the res/ stuff (other than res_jabber) from the RSW branch.

2008-08-10 00:47:56 +00:00

res_config_odbc.c

Merged revisions 172131 via svnmerge from

2009-01-28 22:52:49 +00:00

res_config_pgsql.c

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@145125 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2008-09-29 00:21:45 +00:00

res_config_sqlite.c

Oops, merge from trunk broke 1.6.1

2009-02-05 23:51:18 +00:00

res_convert.c

include "logger.h" and errno.h from asterisk.h - usage shows that they

2007-11-19 18:52:04 +00:00

res_crypto.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

res_curl.c

Separate the global initialization routines for cURL into its own separate

2008-06-25 16:00:54 +00:00

res_http_post.c

Merged revisions 168588 via svnmerge from

2009-01-13 23:14:29 +00:00

res_indications.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

res_jabber.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

res_limit.c

Janitor project to convert sizeof to ARRAY_LEN macro.

2008-07-08 16:40:28 +00:00

res_monitor.c

Merged revisions 183766 via svnmerge from

2009-03-23 18:59:30 +00:00

res_musiconhold.c

Merged revisions 187421,187424 via svnmerge from

2009-04-09 17:43:20 +00:00

res_odbc.c

Merged revisions 176592,176642 via svnmerge from

2009-02-17 21:16:53 +00:00

res_phoneprov.c

Merged revisions 168142 via svnmerge from

2009-01-09 20:30:21 +00:00

res_realtime.c

Merged revisions 165318 via svnmerge from

2008-12-17 21:25:32 +00:00

res_smdi.c

Merged revisions 146802 via svnmerge from

2008-10-06 21:32:42 +00:00

res_snmp.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_speech.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_timing_dahdi.c

Merged revisions 179937 via svnmerge from

2009-03-03 21:00:46 +00:00

res_timing_pthread.c

Merged revisions 176666 via svnmerge from

2009-02-17 21:24:17 +00:00