Mark Michelson 7c4e45ab6e Recorded merge of revisions 194357 via svnmerge from ...

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

................
  r194357 | mmichelson | 2009-05-13 14:42:51 -0500 (Wed, 13 May 2009) | 18 lines
  
  Blocked revisions 194356 via svnmerge
  
  ........
    r194356 | mmichelson | 2009-05-13 14:41:44 -0500 (Wed, 13 May 2009) | 13 lines
    
    Remove an extraneous unlocking operation from ast_channel_free.
    
    In the case that we could not remove the desired channel from the
    list of channels, there was an extra call to unlock the channel list.
    Since we unlock the list later on in the function anyway, this results
    in the list being unlocked twice yet only being locked once.
    
    (closes issue #15098)
    Reported by: tim_ringenbach
    Patches:
          remove_extra_unlock.diff uploaded by tim (license 540)
  ........
................


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

2009-05-13 19:50:37 +00:00

..

db1-ast

Merged revisions 189419 via svnmerge from

2009-04-20 19:47:43 +00:00

editline

Merged revisions 179396 via svnmerge from

2009-03-02 20:18:39 +00:00

stdtime

Merged revisions 157974 via svnmerge from

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

abstract_jb.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

acl.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

adsistub.c

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

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

aescrypt.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aeskey.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aesopt.h

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

aestab.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

alaw.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

app.c

Merged revisions 190057 via svnmerge from

2009-04-22 21:18:11 +00:00

ast_expr2.c

Merged revisions 179973 via svnmerge from

2009-03-03 23:31:54 +00:00

ast_expr2.fl

Merged revisions 179973 via svnmerge from

2009-03-03 23:31:54 +00:00

ast_expr2.h

Merged revisions 179973 via svnmerge from

2009-03-03 23:31:54 +00:00

ast_expr2.y

Merged revisions 179973 via svnmerge from

2009-03-03 23:31:54 +00:00

ast_expr2f.c

Merged revisions 179973 via svnmerge from

2009-03-03 23:31:54 +00:00

asterisk.c

Merged revisions 191700 via svnmerge from

2009-05-02 15:52:08 +00:00

astfd.c

Merged revisions 187302 via svnmerge from

2009-04-09 05:16:25 +00:00

astmm.c

Merged revisions 157632 via svnmerge from

2008-11-19 01:00:44 +00:00

astobj2.c

Merged revisions 192357 via svnmerge from

2009-05-05 13:37:23 +00:00

audiohook.c

Merged revisions 187599 via svnmerge from

2009-04-10 03:56:37 +00:00

autoservice.c

Merged revisions 163449 via svnmerge from

2008-12-12 14:48:40 +00:00

buildinfo.c

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

callerid.c

Merged revisions 180195 via svnmerge from

2009-03-04 19:27:00 +00:00

cdr.c

Merged revisions 159360 via svnmerge from

2008-11-25 23:27:08 +00:00

channel.c

Recorded merge of revisions 194357 via svnmerge from

2009-05-13 19:50:37 +00:00

chanvars.c

Merged revisions 149199 via svnmerge from

2008-10-14 22:42:17 +00:00

cli.c

Merged revisions 190057 via svnmerge from

2009-04-22 21:18:11 +00:00

config.c

Merged revisions 189629 via svnmerge from

2009-04-21 15:20:22 +00:00

cryptostub.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:33:34 +00:00

cygload.c

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

datastore.c

Merged revisions 192318 via svnmerge from

2009-05-05 12:44:54 +00:00

db.c

Merged revisions 182450 via svnmerge from

2009-03-17 05:54:07 +00:00

devicestate.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

dial.c

This commit contains the bug fixes and documentation updates

2008-10-31 20:10:40 +00:00

dns.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +00:00

dnsmgr.c

Merged revisions 166268 via svnmerge from

2008-12-22 16:10:22 +00:00

dsp.c

Merged revisions 158857 via svnmerge from

2008-11-24 21:53:28 +00:00

ecdisa.h

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

enum.c

Merged revisions 180719 via svnmerge from

2009-03-09 21:22:42 +00:00

event.c

Merged revisions 184630 via svnmerge from

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

features.c

Merged revisions 192861 via svnmerge from

2009-05-06 22:19:18 +00:00

file.c

Merged revisions 188585 via svnmerge from

2009-04-15 20:20:23 +00:00

fixedjitterbuf.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

2008-08-06 00:30:53 +00:00

frame.c

Merged revisions 180373 via svnmerge from

2009-03-05 18:40:32 +00:00

fskmodem_float.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem_int.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem.c

(Step 2 of 2)

2008-07-21 21:00:47 +00:00

global_datastores.c

Merged revisions 172580 via svnmerge from

2009-01-31 00:05:17 +00:00

hashtab.c

Merged revisions 149199 via svnmerge from

2008-10-14 22:42:17 +00:00

heap.c

Merged revisions 184512 via svnmerge from

2009-03-27 01:36:42 +00:00

http.c

Merged revisions 187599 via svnmerge from

2009-04-10 03:56:37 +00:00

image.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

indications.c

Merged revisions 168562 via svnmerge from

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

io.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:32:47 +00:00

jitterbuf.c

Merged revisions 174584 via svnmerge from

2009-02-10 18:18:23 +00:00

loader.c

Merged revisions 183242 via svnmerge from

2009-03-19 18:14:55 +00:00

logger.c

Merged revisions 193194 via svnmerge from

2009-05-08 14:10:58 +00:00

Makefile

Merged revisions 187302 via svnmerge from

2009-04-09 05:16:25 +00:00

manager.c

Merged revisions 189419 via svnmerge from

2009-04-20 19:47:43 +00:00

md5.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

netsock.c

Make OpenBSD compile again

2008-06-19 20:25:37 +00:00

pbx.c

Merged revisions 194138 via svnmerge from

2009-05-13 00:54:14 +00:00

plc.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

poll.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:32:47 +00:00

privacy.c

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

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

rtp.c

Merged revisions 194209 via svnmerge from

2009-05-13 13:41:28 +00:00

say.c

Merged revisions 169794 via svnmerge from

2009-01-21 22:11:29 +00:00

sched.c

Merged revisions 175882 via svnmerge from

2009-02-15 21:28:55 +00:00

sha1.c

more header removal/normalization

2007-11-21 00:23:49 +00:00

slinfactory.c

Merged revisions 171622 via svnmerge from

2009-01-27 20:14:49 +00:00

srv.c

Merged revisions 168523 via svnmerge from

2009-01-12 23:13:13 +00:00

strcompat.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

taskprocessor.c

Merged revisions 157041 via svnmerge from

2008-11-15 04:30:42 +00:00

tcptls.c

Merged revisions 180719 via svnmerge from

2009-03-09 21:22:42 +00:00

tdd.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:33:34 +00:00

term.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

threadstorage.c

Merged revisions 164737 via svnmerge from

2008-12-16 17:18:12 +00:00

timing.c

Merged revisions 184762 via svnmerge from

2009-03-27 19:17:22 +00:00

translate.c

Merged revisions 181731 via svnmerge from

2009-03-12 18:07:51 +00:00

udptl.c

Merged revisions 175334 via svnmerge from

2009-02-12 21:27:03 +00:00

ulaw.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

utils.c

Merged revisions 192357 via svnmerge from

2009-05-05 13:37:23 +00:00