Jeff Peeler e21ca8651a Merged revisions 241314 via svnmerge from ...

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

................
  r241314 | jpeeler | 2010-01-19 12:46:11 -0600 (Tue, 19 Jan 2010) | 20 lines
  
  Merged revisions 241227 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r241227 | jpeeler | 2010-01-19 11:22:18 -0600 (Tue, 19 Jan 2010) | 13 lines
    
    Fix deadlock in agent_read by removing call to agent_logoff.
    
    One must always lock the agents list lock before the agent private. agent_read
    locks the private immediately, so locking the agents list lock is not an
    option (which is what agent_logoff requires). Because agent_read already 
    has access to the agent private all that is necessary is to do the required
    hanging up that agent_logoff performed.
    
    (closes issue #16321)
    Reported by: valon24
    Patches: 
          bug16321.patch uploaded by jpeeler (license 325)
  ........
................


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

2010-01-19 19:01:09 +00:00

..

h323

Merged revisions 201678 via svnmerge from

2009-06-18 16:51:54 +00:00

misdn

Merged revisions 221844 via svnmerge from

2009-10-02 01:26:47 +00:00

xpmr

Merged revisions 201678 via svnmerge from

2009-06-18 16:51:54 +00:00

chan_agent.c

Merged revisions 241314 via svnmerge from

2010-01-19 19:01:09 +00:00

chan_alsa.c

Merged revisions 209400 via svnmerge from

2010-01-07 21:17:32 +00:00

chan_console.c

Merged revisions 209400 via svnmerge from

2010-01-07 21:17:32 +00:00

chan_dahdi.c

Merged revisions 232091 via svnmerge from

2009-12-02 00:51:50 +00:00

chan_gtalk.c

Merged revisions 139281,175058,175089 via svnmerge from

2009-09-15 21:53:03 +00:00

chan_h323.c

Fix interpretation of PRIREDIRECTIONREASON set by chan_sip.

2009-10-09 23:11:42 +00:00

chan_iax2.c

Merged revisions 238412 via svnmerge from

2010-01-07 20:20:38 +00:00

chan_jingle.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_local.c

Merged revisions 237319 via svnmerge from

2010-01-04 16:21:35 +00:00

chan_mgcp.c

AST-2009-005

2009-08-10 19:30:55 +00:00

chan_misdn.c

Merged revisions 228145 via svnmerge from

2009-11-05 19:41:40 +00:00

chan_nbs.c

…

chan_oss.c

Merged revisions 209400 via svnmerge from

2010-01-07 21:17:32 +00:00

chan_phone.c

gcc 4.4: Remove a nop memset size 0 that annoys gcc

2009-09-13 21:48:02 +00:00

chan_phone.h

…

chan_sip.c

Show proper stats in "sip show channelstats"

2010-01-13 11:37:56 +00:00

chan_skinny.c

Merged revisions 215665 via svnmerge from

2009-09-02 21:30:37 +00:00

chan_unistim.c

Merged revisions 192938 via svnmerge from

2009-05-07 17:15:00 +00:00

chan_usbradio.c

Merged revisions 209400 via svnmerge from

2010-01-07 21:17:32 +00:00

chan_vpb.cc

Merged revisions 228080 via svnmerge from

2009-11-05 19:19:34 +00:00

console_board.c

…

console_gui.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.h

…

iax2-parser.c

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

iax2-parser.h

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

iax2-provision.c

AST-2009-005

2009-08-10 19:30:55 +00:00

iax2-provision.h

…

iax2.h

Merged revisions 215955 via svnmerge from

2009-09-03 18:41:27 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:48:38 +00:00

misdn_config.c

Merged revisions 222799 via svnmerge from

2009-10-08 16:49:43 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

vgrabbers.c

…