Russell Bryant 7dcb806360 Merged revisions 202497 via svnmerge from ...

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

................
  r202497 | russell | 2009-06-22 15:11:04 -0500 (Mon, 22 Jun 2009) | 11 lines
  
  Merged revisions 202496 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202496 | russell | 2009-06-22 15:08:53 -0500 (Mon, 22 Jun 2009) | 4 lines
    
    Report CallerID change during a masquerade.
    
    Reported by: markster
  ........
................


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

2009-06-22 20:19:57 +00:00

..

db1-ast

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

editline

Merged revisions 179395 via svnmerge from

2009-03-02 20:16:51 +00:00

stdtime

Merged revisions 189539 via svnmerge from

2009-04-20 22:11:36 +00:00

abstract_jb.c

Spacing changes only

2009-03-04 20:48:42 +00:00

acl.c

Spacing changes only

2009-03-04 20:48:42 +00:00

adsistub.c

…

aescrypt.c

Spacing changes only

2009-03-04 20:48:42 +00:00

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

Spacing changes only

2009-03-04 20:48:42 +00:00

app.c

Merged revisions 190057 via svnmerge from

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

ast_expr2.c

Merged revisions 201678 via svnmerge from

2009-06-18 16:44:37 +00:00

ast_expr2.fl

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2.h

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2.y

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2f.c

Merged revisions 201678 via svnmerge from

2009-06-18 16:44:37 +00:00

asterisk.c

Merged revisions 201678 via svnmerge from

2009-06-18 16:44:37 +00:00

astfd.c

Merged revisions 187302 via svnmerge from

2009-04-09 05:12:07 +00:00

astmm.c

Janitor, use ARRAY_LEN() when possible.

2008-12-05 10:31:25 +00:00

astobj2.c

Merged revisions 192357 via svnmerge from

2009-05-05 13:43:12 +00:00

audiohook.c

Merged revisions 197543 via svnmerge from

2009-05-28 15:17:37 +00:00

autoservice.c

Merged revisions 201056 via svnmerge from

2009-06-16 19:47:34 +00:00

bridging.c

Merged revisions 193502 via svnmerge from

2009-05-10 17:08:53 +00:00

buildinfo.c

fix a few small things found by using sparse

2008-10-30 16:49:02 +00:00

callerid.c

Merged revisions 180194 via svnmerge from

2009-03-04 19:24:59 +00:00

cdr.c

Merged revisions 198072 via svnmerge from

2009-05-29 19:14:29 +00:00

channel.c

Merged revisions 202497 via svnmerge from

2009-06-22 20:19:57 +00:00

chanvars.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

cli.c

Merged revisions 190057 via svnmerge from

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

config.c

If there are no realtime engines, there's no reason to check for realtime families

2009-02-17 15:18:55 +00:00

cryptostub.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

cygload.c

…

datastore.c

Merged revisions 192318 via svnmerge from

2009-05-05 13:00:04 +00:00

db.c

Merged revisions 182450 via svnmerge from

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

devicestate.c

Merged revisions 199298 via svnmerge from

2009-06-05 21:25:49 +00:00

dial.c

* Fixed timeout logic in the dialing API as setting timeouts

2008-10-31 20:05:46 +00:00

dns.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

dnsmgr.c

Record the previous port in the temporary address structure so that the comparison does not treat the host as having changed even if it did not. This would have been uninitialized before and would have led to a baddddd port.

2008-12-22 16:08:13 +00:00

dsp.c

Add an option, waitfordialtone, for UK analog lines which do not end a call

2008-11-25 22:45:59 +00:00

ecdisa.h

…

enum.c

Add Doxygen documentation for API changes from 1.6.0 to 1.6.1

2009-03-09 20:58:17 +00:00

event.c

Merged revisions 184630 via svnmerge from

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

features.c

Merged revisions 201829 via svnmerge from

2009-06-19 00:44:52 +00:00

file.c

Merged revisions 201056 via svnmerge from

2009-06-16 19:47:34 +00:00

fixedjitterbuf.c

…

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

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

frame.c

Merged revisions 201056 via svnmerge from

2009-06-16 19:47:34 +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 172517 via svnmerge from

2009-01-30 21:29:12 +00:00

hashtab.c

Add MALLOC_DEBUG to various utility APIs, so that memory leaks can be tracked back to their source.

2009-03-11 00:29:59 +00:00

heap.c

Merged revisions 184512 via svnmerge from

2009-03-27 01:37:29 +00:00

http.c

Merged revisions 187599 via svnmerge from

2009-04-10 03:57:30 +00:00

image.c

…

indications.c

Merged revisions 190993 via svnmerge from

2009-04-29 08:59:00 +00:00

io.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:39:05 +00:00

jitterbuf.c

Merged revisions 174583 via svnmerge from

2009-02-10 18:16:31 +00:00

loader.c

Merged revisions 202410 via svnmerge from

2009-06-22 15:37:55 +00:00

logger.c

Merged revisions 193194 via svnmerge from

2009-05-08 14:12:47 +00:00

Makefile

Merged revisions 187302 via svnmerge from

2009-04-09 05:12:07 +00:00

manager.c

Merged revisions 196945 via svnmerge from

2009-05-26 22:46:44 +00:00

md5.c

…

netsock.c

Make OpenBSD compile again

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

pbx.c

Fixes the argument order in definition of new_find_extension().

2009-06-10 20:37:02 +00:00

plc.c

…

poll.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:39:05 +00:00

privacy.c

…

rtp.c

Don't access rtp->rtcp->* if rtp->rtcp is null

2009-06-11 21:35:37 +00:00

say.c

Fix a crash when saying certain numbers in Chinese

2009-01-21 22:10:02 +00:00

sched.c

Fix a regression in scheduler entry ordering, and add a regression test for it.

2009-02-23 17:29:16 +00:00

sha1.c

…

slinfactory.c

Merged revisions 201056 via svnmerge from

2009-06-16 19:47:34 +00:00

srv.c

bump the verbosity of a message in srv.c up by one. It used to be

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

strcompat.c

…

strings.c

Merged revisions 186021 via svnmerge from

2009-04-02 15:15:22 +00:00

taskprocessor.c

Merged revisions 185912 via svnmerge from

2009-04-01 22:44:34 +00:00

tcptls.c

Add Doxygen documentation for API changes from 1.6.0 to 1.6.1

2009-03-09 20:58:17 +00:00

tdd.c

Merged revisions 185912 via svnmerge from

2009-04-01 22:44:34 +00:00

term.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

threadstorage.c

Merged revisions 164736 via svnmerge from

2008-12-16 17:14:01 +00:00

timing.c

Merged revisions 184762 via svnmerge from

2009-03-27 19:21:33 +00:00

translate.c

Adjust translation table column widths based upon the translation times.

2009-03-12 17:32:13 +00:00

udptl.c

Merged revisions 175311 via svnmerge from

2009-02-12 21:25:14 +00:00

ulaw.c

…

utils.c

Merged revisions 197538 via svnmerge from

2009-05-28 14:56:57 +00:00

xml.c

Merged revisions 197374 via svnmerge from

2009-05-27 23:49:24 +00:00

xmldoc.c

Merged revisions 196948 via svnmerge from

2009-05-26 22:47:35 +00:00