diff options
| author | Automerge script <automerge@asterisk.org> | 2013-01-11 23:20:57 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2013-01-11 23:20:57 +0000 |
| commit | 2c1720b4f7567e0df5b0842b64c79bcf382fc51a (patch) | |
| tree | 3f82660538571cd5060f77c3711652021187faab /main | |
| parent | 919f772f783a50e59beead03c03954647567812c (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile index d0a2d0559..fbb885cf8 100644 --- a/main/Makefile +++ b/main/Makefile @@ -35,6 +35,7 @@ AST_LIBS+=$(BKTR_LIB) AST_LIBS+=$(LIBXML2_LIB) AST_LIBS+=$(SQLITE3_LIB) AST_LIBS+=$(ASTSSL_LIBS) +AST_LIBS+=$(JANSSON_LIB) ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi kfreebsd-gnu linux-gnueabihf),) ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),) |