Tilghman Lesher cb692bccde Merged revisions 163762 via svnmerge from ...

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

................
  r163762 | tilghman | 2008-12-12 16:04:26 -0600 (Fri, 12 Dec 2008) | 14 lines
  
  Merged revisions 163761 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r163761 | tilghman | 2008-12-12 16:03:10 -0600 (Fri, 12 Dec 2008) | 7 lines
    
    Simple fix for Ctrl-C not immediately exiting Asterisk, but also add a
    pointer inside editline to look back to asterisk.c, so others don't spend
    as much time as I did looking (in the wrong place) for the appropriate
    function.
    Reported by: ZX81, via the #asterisk-users channel
    Fixed by: me (license 14)
  ........
................


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

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

..

db1-ast

Merged revisions 157974 via svnmerge from

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

editline

Merged revisions 163762 via svnmerge from

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

stdtime

Merged revisions 157974 via svnmerge from

2008-11-20 00:12:32 +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 161951 via svnmerge from

2008-12-09 15:02:40 +00:00

ast_expr2.c

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

ast_expr2.fl

Merged revisions 144949-144951 via svnmerge from

2008-09-27 16:36:39 +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

Merged revisions 144949-144951 via svnmerge from

2008-09-27 16:36:39 +00:00

ast_expr2f.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

asterisk.c

Merged revisions 163762 via svnmerge from

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

astmm.c

Merged revisions 144949-144951 via svnmerge from

2008-09-27 16:36:39 +00:00

astobj2.c

Merged revisions 161427 via svnmerge from

2008-12-05 21:13:44 +00:00

audiohook.c

Merged revisions 147518,147689,148000,148112,148268,148917,148988,149062,149131,149201,149205,149208 via svnmerge from

2008-12-02 22:16:32 +00:00

autoservice.c

Merged revisions 163449 via svnmerge from

2008-12-12 14:05:01 +00:00

buildinfo.c

…

callerid.c

Merged revisions 160945 via svnmerge from

2008-12-04 16:47:19 +00:00

cdr.c

Merged revisions 159360 via svnmerge from

2008-11-25 23:09:11 +00:00

channel.c

Merged revisions 163449 via svnmerge from

2008-12-12 14:05:01 +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 160208 via svnmerge from

2008-12-02 00:57:31 +00:00

config.c

Merged revisions 161181 via svnmerge from

2008-12-05 05:43:36 +00:00

cryptostub.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:25:31 +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 159818 via svnmerge from

2008-11-29 18:37:55 +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

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

features.c

Merged revisions 163094 via svnmerge from

2008-12-11 17:11:50 +00:00

file.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +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 160208 via svnmerge from

2008-12-02 00:57: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

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +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

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

Makefile

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

manager.c

Merged revisions 161790 via svnmerge from

2008-12-08 18:51:30 +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 162266 via svnmerge from

2008-12-09 20:31:21 +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 140817 via svnmerge from

2008-09-03 13:27:14 +00:00

privacy.c

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

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

rtp.c

Merged revisions 162656 via svnmerge from

2008-12-10 16:07:51 +00:00

say.c

Merged revisions 132113 via svnmerge from

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

sched.c

Merged revisions 142355 via svnmerge from

2008-09-10 16:42:32 +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 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

strcompat.c

Merged revisions 105840 via svnmerge from

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

tcptls.c

Merged revisions 163670 via svnmerge from

2008-12-12 18:52:14 +00:00

tdd.c

Merged revisions 148200 via svnmerge from

2008-10-10 01:25:31 +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 148612 via svnmerge from

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

udptl.c

Merged revisions 159475 via svnmerge from

2008-11-26 18:40:28 +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 162414 via svnmerge from

2008-12-09 22:30:52 +00:00