Mark Michelson 0c0fdebd9f Merged revisions 156169 via svnmerge from ...

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

................
r156169 | mmichelson | 2008-11-12 11:41:56 -0600 (Wed, 12 Nov 2008) | 15 lines

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

........
r156167 | mmichelson | 2008-11-12 11:38:33 -0600 (Wed, 12 Nov 2008) | 7 lines

When doing some tests, I was having a crash at the end of every call
if an attended transfer occurred during the call. I traced the cause to
the CDR on one of the channels being NULL. murf suggested a check in
the end bridge callback to be sure the CDR is non-NULL before proceeding,
so that's what I'm adding.


........

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


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

2008-11-12 17:48:24 +00:00

..

app_adsiprog.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

app_alarmreceiver.c

…

app_amd.c

…

app_authenticate.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

app_cdr.c

…

app_chanisavail.c

…

app_channelredirect.c

…

app_chanspy.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

app_controlplayback.c

…

app_dahdibarge.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_dahdiras.c

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

2008-07-29 22:22:13 +00:00

app_dahdiscan.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_db.c

…

app_dial.c

Merged revisions 156169 via svnmerge from

2008-11-12 17:48:24 +00:00

app_dictate.c

…

app_directed_pickup.c

…

app_directory.c

Merged revisions 152646 via svnmerge from

2008-10-29 20:55:22 +00:00

app_disa.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_dumpchan.c

…

app_echo.c

Merged revisions 149588 via svnmerge from

2008-10-15 15:31:03 +00:00

app_exec.c

…

app_externalivr.c

Merged revisions 151101 via svnmerge from

2008-10-19 19:33:42 +00:00

app_fax.c

Merged revisions 148868 via svnmerge from

2008-10-14 15:18:10 +00:00

app_festival.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

app_flash.c

…

app_followme.c

Merged revisions 155554 via svnmerge from

2008-11-09 01:43:14 +00:00

app_forkcdr.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_getcpeid.c

…

app_ices.c

Merged revisions 135058 via svnmerge from

2008-08-01 11:47:34 +00:00

app_image.c

Change SendImage() to output a more consistent status variable.

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

app_ivrdemo.c

…

app_jack.c

Merged revisions 140566 via svnmerge from

2008-09-02 15:13:10 +00:00

app_macro.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_meetme.c

Merged revisions 147714 via svnmerge from

2008-10-08 22:33:43 +00:00

app_milliwatt.c

…

app_minivm.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_mixmonitor.c

Merged revisions 151371 via svnmerge from

2008-10-21 15:21:42 +00:00

app_morsecode.c

…

app_mp3.c

…

app_nbscat.c

…

app_osplookup.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_page.c

…

app_parkandannounce.c

remove remaining Zaptel references in various places

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

app_playback.c

Merged revisions 144569 via svnmerge from

2008-09-25 22:25:34 +00:00

app_privacy.c

…

app_queue.c

Merged revisions 155554 via svnmerge from

2008-11-09 01:43:14 +00:00

app_read.c

…

app_readexten.c

…

app_readfile.c

…

app_record.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_rpt.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_sayunixtime.c

…

app_senddtmf.c

…

app_sendtext.c

…

app_setcallerid.c

…

app_skel.c

…

app_sms.c

import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch

2008-11-02 23:56:13 +00:00

app_softhangup.c

…

app_speech_utils.c

Merged revisions 147518 via svnmerge from

2008-10-08 15:10:08 +00:00

app_stack.c

Merged revision 153709 from trunk

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

app_system.c

…

app_talkdetect.c

…

app_test.c

…

app_transfer.c

Merged revisions 152132 via svnmerge from

2008-10-27 16:06:01 +00:00

app_url.c

…

app_userevent.c

…

app_verbose.c

…

app_voicemail.c

Recorded merge of revisions 154072 via svnmerge from

2008-11-03 22:32:27 +00:00

app_waitforring.c

…

app_waitforsilence.c

Merged revisions 149062 via svnmerge from

2008-10-14 20:17:34 +00:00

app_waituntil.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_while.c

More RSW merges. Everything from apps/ except for the big offenders

2008-08-10 14:45:25 +00:00

app_zapateller.c

…

enter.h

…

leave.h

…

Makefile

…

rpt_flow.pdf

…