Merged revisions 378915,378918 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Fri, 11 Jan 2013 23:20:57 +0000 (23:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Fri, 11 Jan 2013 23:20:57 +0000 (23:20 +0000)
commit2c1720b4f7567e0df5b0842b64c79bcf382fc51a
tree3f82660538571cd5060f77c3711652021187faab
parent919f772f783a50e59beead03c03954647567812c
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
13 files changed:
build_tools/menuselect-deps.in
configure
configure.ac
contrib/scripts/install_prereq
include/asterisk/autoconfig.h.in
include/asterisk/json.h [new file with mode: 0644]
include/asterisk/test.h
main/Makefile
makeopts.in
res/res_json.c [new file with mode: 0644]
res/res_json.exports.in [new file with mode: 0644]
res/res_xmpp.c
tests/test_json.c [new file with mode: 0644]