You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Automerge script 2c1720b4f7 Merged revisions 378915,378918 via svnmerge from ... file:///srv/subversion/repos/asterisk/trunk ................ r378915 | dlee | 2013-01-11 16:31:42 -0600 (Fri, 11 Jan 2013) | 21 lines Add JSON API for Asterisk. This provides a JSON API by pulling in and wrapping the Jansson JSON library[1]. The Asterisk API basically mirrors the Jansson functionality, with a few minor tweaks. * Some names have been asteriskified to protect the innocent. * Jansson provides both reference-stealing and reference-borrowing versions of several API's. The Asterisk API is exclusively reference-stealing for operations that put elements into arrays and objects. * No support for doubles, since we usually don't need that. * Coming along for the ride is the ast_test_validate macro, which made the unit tests much easier to write. [1]: http://www.digip.org/jansson/ (issue ASTERISK-20887) (closes issue ASTERISK-20888) Review: https://reviewboard.asterisk.org/r/2264/ ................ r378918 | file | 2013-01-11 17:05:38 -0600 (Fri, 11 Jan 2013) | 11 lines Retain XMPP filters across reconnections so external modules continue to function as expected. Previously if an XMPP client reconnected any filters added by an external module were lost. This issue exhibited itself with chan_motif not receiving and reacting to Jingle signaling. (closes issue ASTERISK-20916) Reported by: kuj ........ Merged revisions 378917 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378927 65c4cc65-6c06-0410-ace0-fbb531ad65f3		14 years ago
..
ael	…
pjproject	Merged revisions 378565,378585 via svnmerge from	14 years ago
snmp	…
Makefile	Doxygen Updates - Title update	14 years ago
res_adsi.c	…
res_ael_share.c	…
res_ael_share.exports.in	…
res_agi.c	Fix DBDelTree error codes for AMI, CLI and AGI	14 years ago
res_agi.exports.in	…
res_calendar.c	Merged revisions 378322 via svnmerge from	14 years ago
res_calendar.exports.in	…
res_calendar_caldav.c	…
res_calendar_ews.c	Properly extract the Body information of an EWS calendar item	14 years ago
res_calendar_exchange.c	Merged revisions 378000-378002 via svnmerge from	14 years ago
res_calendar_icalendar.c	…
res_clialiases.c	Resolve conflict and reset automerge.	14 years ago
res_clioriginate.c	…
res_config_curl.c	…
res_config_ldap.c	Merged revisions 378543 via svnmerge from	14 years ago
res_config_odbc.c	…
res_config_pgsql.c	Doxygen Updates - Title update	14 years ago
res_config_sqlite.c	Doxygen Updates - Title update	14 years ago
res_config_sqlite3.c	Doxygen Updates - Title update	14 years ago
res_convert.c	…
res_corosync.c	…
res_crypto.c	…
res_crypto.exports.in	…
res_curl.c	Doxygen Updates - Title update	14 years ago
res_fax.c	Merged revisions 377658 via svnmerge from	14 years ago
res_fax.exports.in	…
res_fax_spandsp.c	Refactor ast_timer_ack to return an error and handle the error in timer users	14 years ago
res_format_attr_celt.c	…
res_format_attr_h263.c	…
res_format_attr_h264.c	…
res_format_attr_silk.c	…
res_http_post.c	…
res_http_websocket.c	Merged revisions 376562 via svnmerge from	14 years ago
res_http_websocket.exports.in	Fix an issue with res_http_websocket where the chan_sip WebSocket handler could not be registered.	14 years ago
res_jabber.c	Merged revisions 378322 via svnmerge from	14 years ago
res_jabber.exports.in	…
res_json.c	Merged revisions 378915,378918 via svnmerge from	14 years ago
res_json.exports.in	Merged revisions 378915,378918 via svnmerge from	14 years ago
res_limit.c	Doxygen Updates - Title update	14 years ago
res_monitor.c	…
res_monitor.exports.in	…
res_musiconhold.c	Refactor ast_timer_ack to return an error and handle the error in timer users	14 years ago
res_mutestream.c	…
res_odbc.c	Doxygen Updates - Title update	14 years ago
res_odbc.exports.in	…
res_phoneprov.c	Doxygen Updates - Title update	14 years ago
res_pktccops.c	…
res_pktccops.exports.in	…
res_realtime.c	…
res_rtp_asterisk.c	Merged revisions 378557 via svnmerge from	14 years ago
res_rtp_multicast.c	…
res_security_log.c	…
res_smdi.c	Doxygen Updates - Title update	14 years ago
res_smdi.exports.in	…
res_snmp.c	Doxygen Updates - Title update	14 years ago
res_speech.c	…
res_speech.exports.in	…
res_srtp.c	Merged revisions 378593 via svnmerge from	14 years ago
res_srtp.exports.in	…
res_stun_monitor.c	…
res_timing_dahdi.c	Refactor ast_timer_ack to return an error and handle the error in timer users	14 years ago
res_timing_kqueue.c	Refactor ast_timer_ack to return an error and handle the error in timer users	14 years ago
res_timing_pthread.c	Refactor ast_timer_ack to return an error and handle the error in timer users	14 years ago
res_timing_timerfd.c	Refactor ast_timer_ack to return an error and handle the error in timer users	14 years ago
res_xmpp.c	Merged revisions 378915,378918 via svnmerge from	14 years ago
res_xmpp.exports.in	…