Steve Murphy 37d5dcdfa9 Merged revisions 139662 via svnmerge from ...

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

................
r139662 | murf | 2008-08-22 16:32:35 -0600 (Fri, 22 Aug 2008) | 14 lines

Merged revisions 139635 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines

I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.


........

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


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

2008-08-22 22:37:08 +00:00

..

db1-ast

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

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

editline

Merged revisions 129343 via svnmerge from

2008-07-09 13:44:43 +00:00

stdtime

Merged revisions 103845 via svnmerge from

2008-02-20 18:28:00 +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

…

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

Whitespace changes only

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

app.c

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

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

ast_expr2.c

(closes issue #12467)

2008-04-21 21:13:02 +00:00

ast_expr2.fl

Change references to doc/channelvariables.txt to

2008-06-20 16:30:18 +00:00

ast_expr2.h

(closes issue #12467)

2008-04-21 21:13:02 +00:00

ast_expr2.y

(closes issue #12467)

2008-04-21 21:13:02 +00:00

ast_expr2f.c

Change references to doc/channelvariables.txt to

2008-06-20 16:30:18 +00:00

asterisk.c

Another batch of files from RSW. The remaining apps and a few more

2008-08-10 20:23:50 +00:00

astmm.c

Merged revisions 129966 via svnmerge from

2008-07-11 14:16:15 +00:00

astobj2.c

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

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

audiohook.c

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

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

autoservice.c

Merged revisions 138028 via svnmerge from

2008-08-15 20:21:38 +00:00

buildinfo.c

…

callerid.c

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

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

cdr.c

Merged revisions 139083 via svnmerge from

2008-08-20 17:34:53 +00:00

channel.c

Convert deprecated routines to the new names.

2008-08-13 17:36:15 +00:00

chanvars.c

…

cli.c

Another batch of files from RSW. The remaining apps and a few more

2008-08-10 20:23:50 +00:00

config.c

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

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

cryptostub.c

Whitespace changes only

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

cygload.c

…

datastore.c

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

db.c

Several manager changes:

2008-01-10 00:12:35 +00:00

devicestate.c

actually use the cache_cache argument

2008-07-26 15:16:20 +00:00

dial.c

Convert one more delimiter to use comma.

2008-06-13 14:15:07 +00:00

dns.c

Fix a bug in SRV lookups where dnsmgr would discard everything but the

2008-07-08 21:00:01 +00:00

dnsmgr.c

Merged revisions 130735 via svnmerge from

2008-07-14 17:21:18 +00:00

dsp.c

Janitor patch to change uses of sizeof to ARRAY_LEN

2008-07-11 18:09:35 +00:00

ecdisa.h

…

enum.c

The following patch adds new options and alters the default behavior of the ENUM* functions. The TXCIDNAME lookup function has also gotten a

2008-05-09 19:54:45 +00:00

event.c

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

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

features.c

Merged revisions 139662 via svnmerge from

2008-08-22 22:37:08 +00:00

file.c

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

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

fixedjitterbuf.c

…

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

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

frame.c

Another batch of files from RSW. The remaining apps and a few more

2008-08-10 20:23:50 +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

Asterisk, when parking can drop rights a caller when a parking timeout occurs. Also, when doing built-in attended transfers, sometimes incorrectly passes rights from the transferrer to the transferee. This patch tries to fixes the parking issue and lays some groundwork for later fixing the transfer issue.

2008-03-01 01:30:37 +00:00

hashtab.c

Fix magic Revision keywords in hashtab.c and change cdr_radius.c to use

2008-07-18 17:55:41 +00:00

http.c

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

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

image.c

Whitespace changes only

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

indications.c

Another batch of files from RSW. The remaining apps and a few more

2008-08-10 20:23:50 +00:00

io.c

Merged revisions 94977 via svnmerge from

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

jitterbuf.c

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

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

loader.c

remove remaining Zaptel references in various places

2008-07-28 16:42:00 +00:00

logger.c

Another batch of files from RSW. The remaining apps and a few more

2008-08-10 20:23:50 +00:00

Makefile

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

manager.c

Merged revisions 139624 via svnmerge from

2008-08-22 21:58:38 +00:00

md5.c

…

netsock.c

Make OpenBSD compile again

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

pbx.c

Merged revisions 139627 via svnmerge from

2008-08-22 22:15:36 +00:00

plc.c

…

poll.c

Whitespace changes only

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

privacy.c

…

rtp.c

Merged revisions 138476 via svnmerge from

2008-08-17 13:42:59 +00:00

say.c

That's all, folks. Not going to update the Makefile until res_jabber is

2008-08-10 20:57:25 +00:00

sched.c

That's all, folks. Not going to update the Makefile until res_jabber is

2008-08-10 20:57:25 +00:00

sha1.c

…

slinfactory.c

- revert change to ast_queue_hangup and create ast_queue_hangup_with_cause

2008-05-22 16:29:54 +00:00

srv.c

Fix a bug in SRV lookups where dnsmgr would discard everything but the

2008-07-08 21:00:01 +00:00

strcompat.c

Whitespace changes only

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

taskprocessor.c

That's all, folks. Not going to update the Makefile until res_jabber is

2008-08-10 20:57:25 +00:00

tcptls.c

Fix a crash in tcp and tls connections related to reference counts.

2008-06-18 20:07:56 +00:00

tdd.c

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

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

term.c

Whitespace changes only

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

threadstorage.c

Janitor patch to change uses of sizeof to ARRAY_LEN

2008-07-11 18:09:35 +00:00

timing.c

- add get_max_rate timing API call

2008-06-26 15:37:01 +00:00

translate.c

Merged revisions 135915 via svnmerge from

2008-08-06 03:29:42 +00:00

udptl.c

That's all, folks. Not going to update the Makefile until res_jabber is

2008-08-10 20:57:25 +00:00

ulaw.c

…

utils.c

Merged revisions 132872 via svnmerge from

2008-07-23 16:30:18 +00:00