[Asterisk-cvs] asterisk/res res_musiconhold.c,1.71,1.72
markster
markster
Tue Oct 18 23:57:33 CDT 2005
- Previous message: [Asterisk-cvs] asterisk/channels chan_local.c,1.53,1.54
- Next message: [Asterisk-cvs] asterisk/apps app_adsiprog.c, 1.16,
1.17 app_alarmreceiver.c, 1.16, 1.17 app_authenticate.c, 1.16,
1.17 app_cdr.c, 1.8, 1.9 app_chanisavail.c, 1.23,
1.24 app_chanspy.c, 1.26, 1.27 app_controlplayback.c, 1.14,
1.15 app_curl.c, 1.12, 1.13 app_cut.c, 1.15, 1.16 app_db.c,
1.14, 1.15 app_dial.c, 1.171, 1.172 app_dictate.c, 1.6,
1.7 app_directed_pickup.c, 1.4, 1.5 app_directory.c, 1.46,
1.47 app_disa.c, 1.35, 1.36 app_dumpchan.c, 1.11,
1.12 app_enumlookup.c, 1.22, 1.23 app_eval.c, 1.8,
1.9 app_externalivr.c, 1.10, 1.11 app_festival.c, 1.34,
1.35 app_groupcount.c, 1.22, 1.23 app_hasnewvoicemail.c, 1.18,
1.19 app_ices.c, 1.9, 1.10 app_image.c, 1.9,
1.10 app_intercom.c, 1.24, 1.25 app_ivrdemo.c, 1.9,
1.10 app_macro.c, 1.29, 1.30 app_math.c, 1.14, 1.15 app_md5.c,
1.9, 1.10 app_meetme.c, 1.113, 1.114 app_milliwatt.c, 1.13,
1.14 app_mp3.c, 1.28, 1.29 app_muxmon.c, 1.3, 1.4 app_nbscat.c,
1.13, 1.14 app_osplookup.c, 1.11, 1.12 app_page.c, 1.6,
1.7 app_parkandannounce.c, 1.17, 1.18 app_playback.c, 1.21,
1.22 app_queue.c, 1.171, 1.172 app_random.c, 1.9,
1.10 app_read.c, 1.23, 1.24 app_readfile.c, 1.9,
1.10 app_realtime.c, 1.13, 1.14 app_record.c, 1.38,
1.39 app_senddtmf.c, 1.12, 1.13 app_sendtext.c, 1.10,
1.11 app_setcallerid.c, 1.11, 1.12 app_setcdruserfield.c, 1.10,
1.11 app_setcidname.c, 1.12, 1.13 app_setcidnum.c, 1.13,
1.14 app_setrdnis.c, 1.8, 1.9 app_settransfercapability.c, 1.8,
1.9 app_skel.c, 1.14, 1.15 app_sms.c, 1.28,
1.29 app_softhangup.c, 1.10, 1.11 app_sql_postgres.c, 1.14,
1.15 app_striplsd.c, 1.8, 1.9 app_substring.c, 1.13,
1.14 app_system.c, 1.19, 1.20 app_talkdetect.c, 1.14,
1.15 app_test.c, 1.13, 1.14 app_transfer.c, 1.15,
1.16 app_txtcidname.c, 1.19, 1.20 app_url.c, 1.12,
1.13 app_userevent.c, 1.8, 1.9 app_verbose.c, 1.7,
1.8 app_voicemail.c, 1.252, 1.253 app_waitforring.c, 1.8,
1.9 app_waitforsilence.c, 1.10, 1.11 app_while.c, 1.11,
1.12 app_zapateller.c, 1.11, 1.12 app_zapbarge.c, 1.11,
1.12 app_zapras.c, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv10657/res
Modified Files:
res_musiconhold.c
Log Message:
Fix res_musiconhold lock
Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- res_musiconhold.c 14 Sep 2005 20:46:50 -0000 1.71
+++ res_musiconhold.c 19 Oct 2005 03:51:25 -0000 1.72
@@ -1066,7 +1066,7 @@
pid = moh->pid;
moh->pid = 0;
kill(pid, SIGKILL);
- while ((ast_wait_for_input(moh->srcfd, 100) > -1) && (bytes = read(moh->srcfd, buff, 8192)) && time(NULL) < stime) {
+ while ((ast_wait_for_input(moh->srcfd, 100) > 0) && (bytes = read(moh->srcfd, buff, 8192)) && time(NULL) < stime) {
tbytes = tbytes + bytes;
}
ast_log(LOG_DEBUG, "mpg123 pid %d and child died after %d bytes read\n", pid, tbytes);
- Previous message: [Asterisk-cvs] asterisk/channels chan_local.c,1.53,1.54
- Next message: [Asterisk-cvs] asterisk/apps app_adsiprog.c, 1.16,
1.17 app_alarmreceiver.c, 1.16, 1.17 app_authenticate.c, 1.16,
1.17 app_cdr.c, 1.8, 1.9 app_chanisavail.c, 1.23,
1.24 app_chanspy.c, 1.26, 1.27 app_controlplayback.c, 1.14,
1.15 app_curl.c, 1.12, 1.13 app_cut.c, 1.15, 1.16 app_db.c,
1.14, 1.15 app_dial.c, 1.171, 1.172 app_dictate.c, 1.6,
1.7 app_directed_pickup.c, 1.4, 1.5 app_directory.c, 1.46,
1.47 app_disa.c, 1.35, 1.36 app_dumpchan.c, 1.11,
1.12 app_enumlookup.c, 1.22, 1.23 app_eval.c, 1.8,
1.9 app_externalivr.c, 1.10, 1.11 app_festival.c, 1.34,
1.35 app_groupcount.c, 1.22, 1.23 app_hasnewvoicemail.c, 1.18,
1.19 app_ices.c, 1.9, 1.10 app_image.c, 1.9,
1.10 app_intercom.c, 1.24, 1.25 app_ivrdemo.c, 1.9,
1.10 app_macro.c, 1.29, 1.30 app_math.c, 1.14, 1.15 app_md5.c,
1.9, 1.10 app_meetme.c, 1.113, 1.114 app_milliwatt.c, 1.13,
1.14 app_mp3.c, 1.28, 1.29 app_muxmon.c, 1.3, 1.4 app_nbscat.c,
1.13, 1.14 app_osplookup.c, 1.11, 1.12 app_page.c, 1.6,
1.7 app_parkandannounce.c, 1.17, 1.18 app_playback.c, 1.21,
1.22 app_queue.c, 1.171, 1.172 app_random.c, 1.9,
1.10 app_read.c, 1.23, 1.24 app_readfile.c, 1.9,
1.10 app_realtime.c, 1.13, 1.14 app_record.c, 1.38,
1.39 app_senddtmf.c, 1.12, 1.13 app_sendtext.c, 1.10,
1.11 app_setcallerid.c, 1.11, 1.12 app_setcdruserfield.c, 1.10,
1.11 app_setcidname.c, 1.12, 1.13 app_setcidnum.c, 1.13,
1.14 app_setrdnis.c, 1.8, 1.9 app_settransfercapability.c, 1.8,
1.9 app_skel.c, 1.14, 1.15 app_sms.c, 1.28,
1.29 app_softhangup.c, 1.10, 1.11 app_sql_postgres.c, 1.14,
1.15 app_striplsd.c, 1.8, 1.9 app_substring.c, 1.13,
1.14 app_system.c, 1.19, 1.20 app_talkdetect.c, 1.14,
1.15 app_test.c, 1.13, 1.14 app_transfer.c, 1.15,
1.16 app_txtcidname.c, 1.19, 1.20 app_url.c, 1.12,
1.13 app_userevent.c, 1.8, 1.9 app_verbose.c, 1.7,
1.8 app_voicemail.c, 1.252, 1.253 app_waitforring.c, 1.8,
1.9 app_waitforsilence.c, 1.10, 1.11 app_while.c, 1.11,
1.12 app_zapateller.c, 1.11, 1.12 app_zapbarge.c, 1.11,
1.12 app_zapras.c, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the svn-commits
mailing list