Steve Murphy 76be7d91a9 Merged revisions 139083 via svnmerge from ...

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

................
r139083 | murf | 2008-08-20 11:25:07 -0600 (Wed, 20 Aug 2008) | 20 lines

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

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines


(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.



........

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


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

2008-08-20 17:30:58 +00:00

..

db1-ast

clean up assembler and preprocessor files if they are here too

2007-10-29 22:24:44 +00:00

editline

Merged revisions 129344 via svnmerge from

2008-07-09 13:46:07 +00:00

stdtime

Merged revisions 103845 via svnmerge from

2008-02-20 18:28:00 +00:00

abstract_jb.c

Merged revisions 135851 via svnmerge from

2008-08-06 00:31:28 +00:00

acl.c

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

adsistub.c

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

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

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

app.c

Merged revisions 134476 via svnmerge from

2008-07-30 18:33:58 +00:00

ast_expr2.c

Terry found this problem with running the expr2 parser on OSX. Make the #defines come out the same between the parser & lexer.

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

ast_expr2.fl

Merged revisions 124278 via svnmerge from

2008-06-20 16:31:26 +00:00

ast_expr2.h

Terry found this problem with running the expr2 parser on OSX. Make the #defines come out the same between the parser & lexer.

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

ast_expr2.y

Terry found this problem with running the expr2 parser on OSX. Make the #defines come out the same between the parser & lexer.

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

ast_expr2f.c

Merged revisions 124278 via svnmerge from

2008-06-20 16:31:26 +00:00

asterisk.c

Merged revisions 134050 via svnmerge from

2008-07-28 16:13:34 +00:00

astmm.c

Merged revisions 129968 via svnmerge from

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

astobj2.c

Merged revisions 123272 via svnmerge from

2008-06-17 15:52:36 +00:00

audiohook.c

Merged revisions 130635 via svnmerge from

2008-07-14 10:40:20 +00:00

autoservice.c

Merged revisions 138028 via svnmerge from

2008-08-15 15:12:08 +00:00

buildinfo.c

…

callerid.c

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

cdr.c

Merged revisions 139083 via svnmerge from

2008-08-20 17:30:58 +00:00

channel.c

Merged revisions 136633 via svnmerge from

2008-08-07 19:54:47 +00:00

chanvars.c

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

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

cli.c

Merged revisions 135598 via svnmerge from

2008-08-05 13:27:59 +00:00

config.c

Merged revisions 132109 via svnmerge from

2008-07-18 18:51:20 +00:00

cryptostub.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

cygload.c

Doxygen updates, formatting.

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

db.c

Several manager changes:

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

devicestate.c

Merged revisions 133945-133946 via svnmerge from

2008-07-26 15:17:46 +00:00

dial.c

Merged revisions 122557 via svnmerge from

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

dns.c

Merged revisions 129156 via svnmerge from

2008-07-08 21:04:56 +00:00

dnsmgr.c

Merged revisions 130744 via svnmerge from

2008-07-14 17:22:54 +00:00

dsp.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

ecdisa.h

…

enum.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

event.c

Fix a small logic error in ast_event_iterator_next. The previous logic allowed for the iterator

2008-02-13 00:55:09 +00:00

features.c

Merged revisions 138482 via svnmerge from

2008-08-17 14:14:46 +00:00

file.c

Merged revisions 134086 via svnmerge from

2008-07-28 16:49:18 +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 135851 via svnmerge from

2008-08-06 00:31:28 +00:00

frame.c

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

fskmodem_float.c

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

fskmodem_int.c

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

fskmodem.c

Merged revisions 132511 via svnmerge from

2008-07-21 21:02:55 +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

Merged revisions 132050 via svnmerge from

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

http.c

Merged revisions 135016 via svnmerge from

2008-07-31 22:34:44 +00:00

image.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

indications.c

Just some minor coding style cleanup...

2008-02-11 18:27:47 +00:00

io.c

Merged revisions 94977 via svnmerge from

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

jitterbuf.c

Merged revisions 109447 via svnmerge from

2008-03-18 15:58:50 +00:00

loader.c

Merged revisions 134086 via svnmerge from

2008-07-28 16:49:18 +00:00

logger.c

Merged revisions 133448 via svnmerge from

2008-07-24 19:55:12 +00:00

Makefile

Merged revisions 134125 via svnmerge from

2008-07-28 19:55:44 +00:00

manager.c

Merged revisions 134980 via svnmerge from

2008-07-31 21:58:26 +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

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

pbx.c

Merged revisions 138815 via svnmerge from

2008-08-19 16:36:22 +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 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

privacy.c

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

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

rtp.c

Merged revisions 138476 via svnmerge from

2008-08-17 13:41:56 +00:00

say.c

Merged revisions 132113 via svnmerge from

2008-07-18 19:10:21 +00:00

sched.c

Merged revisions 134703 via svnmerge from

2008-07-30 22:41:23 +00:00

sha1.c

more header removal/normalization

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

slinfactory.c

Merged revisions 112126 via svnmerge from

2008-04-01 16:57:16 +00:00

srv.c

Merged revisions 129156 via svnmerge from

2008-07-08 21:04:56 +00:00

strcompat.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

tcptls.c

Merged revisions 123692 via svnmerge from

2008-06-18 20:08:45 +00:00

tdd.c

Merged revisions 132510 via svnmerge from

2008-07-21 21:02:25 +00:00

term.c

Merged revisions 105840 via svnmerge from

2008-03-06 00:14:32 +00:00

threadstorage.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

translate.c

Merged revisions 135938 via svnmerge from

2008-08-06 03:30:23 +00:00

udptl.c

Merged revisions 116469 via svnmerge from

2008-05-14 21:41:09 +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 132964 via svnmerge from

2008-07-23 16:34:46 +00:00