kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-04-29 02:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
d2af16a86c515c6d563cbb3eb30fcfdd5b59ec6a
asterisk/res
History
Terry Wilson c38cb95863 Merged revisions 332321 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r332321 | twilson | 2011-08-17 13:09:49 -0500 (Wed, 17 Aug 2011) | 17 lines
  
  Merged revisions 332320 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r332320 | twilson | 2011-08-17 12:35:27 -0500 (Wed, 17 Aug 2011) | 10 lines
    
    Don't read from a disarmed or invalid timerfd
    
    Numerous isues have been reported for deadlocks that are caused by
    a blocking read in res_timing_timerfd on a file descriptor that will
    never be written to. This patch adds some checks to make sure that
    the timerfd is both valid and armed before calling read().
    
    Should fix: ASTERISK-18142, ASTERISK-18166, ASTERISK-18197, AST-486,
    AST-495, AST-507 and possibly others.

    Review: https://reviewboard.asterisk.org/r/1361/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-17 18:31:39 +00:00
..
ael
Merged revisions 299449 via svnmerge from
2010-12-22 20:10:34 +00:00
ais
Replace ast_log(LOG_DEBUG, ...) with ast_debug()
2011-02-04 16:55:39 +00:00
snmp
Expand the caller ANI field to an ast_party_id
2010-07-14 16:58:03 +00:00
Makefile
Merged revisions 318351 via svnmerge from
2011-05-09 23:16:12 +00:00
res_adsi.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_adsi.exports.in
Remove the old stub files, preferring the optional_api method.
2010-07-14 20:48:59 +00:00
res_ael_share.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_ael_share.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_agi.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_agi.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_ais.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_calendar_caldav.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_calendar_ews.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_calendar_exchange.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_calendar_icalendar.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_calendar.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_calendar.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_clialiases.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_clioriginate.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_config_curl.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_config_ldap.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_config_odbc.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_config_pgsql.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_config_sqlite.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_convert.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_crypto.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_crypto.exports.in
Remove built-in AES code and use optional_api instead
2010-07-21 19:11:32 +00:00
res_curl.c
Add load priority order, such that preload becomes unnecessary in most cases
2010-07-20 19:35:02 +00:00
res_fax_spandsp.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_fax.c
Merged revisions 329992 via svnmerge from
2011-07-28 15:30:30 +00:00
res_fax.exports.in
Log spandsp's fax debug output to the FAX logger level.
2010-05-21 15:15:58 +00:00
res_format_attr_celt.c
Moves celt and silk format attribute files into res folder.
2011-07-08 20:18:39 +00:00
res_format_attr_silk.c
Moves celt and silk format attribute files into res folder.
2011-07-08 20:18:39 +00:00
res_http_post.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_jabber.c
Merged revisions 330649 via svnmerge from
2011-08-02 20:54:19 +00:00
res_jabber.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_limit.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_monitor.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_monitor.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_musiconhold.c
Merged revisions 331039 via svnmerge from
2011-08-08 20:54:14 +00:00
res_mutestream.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_odbc.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_odbc.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_phoneprov.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_pktccops.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_pktccops.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_realtime.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_rtp_asterisk.c
Merged revisions 328824 via svnmerge from
2011-07-19 18:07:22 +00:00
res_rtp_multicast.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_security_log.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_smdi.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_smdi.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_snmp.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_speech.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_speech.exports.in
Allow symbol export filtering to work properly on platforms that have symbol prefixes.
2010-04-02 18:57:58 +00:00
res_srtp.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_srtp.exports.in
Add SRTP support for Asterisk
2010-06-08 05:29:08 +00:00
res_stun_monitor.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_timing_dahdi.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_timing_kqueue.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_timing_pthread.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +00:00
res_timing_timerfd.c
Merged revisions 332321 via svnmerge from
2011-08-17 18:31:39 +00:00