Module: kamailio Branch: 4.4 Commit: 78bc680355075304e6e93d91347a564ac8eed20f URL: https://github.com/kamailio/kamailio/commit/78bc680355075304e6e93d91347a564a...

Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: 2016-03-30T08:53:57+02:00

Merge branch '4.4' of https://github.com/kamailio/kamailio into 4.4

* '4.4' of https://github.com/kamailio/kamailio: (32 commits) Update hep.c core: mem - updated defines to pkg mod stats Makefile.defs: version set to 4.4.0-rc2 Makefile.defs: re-enable pkg malloc topos: reused stored branch attributes in case of retransmission http_async_client: use pkg-config for libevent compile flags detection mem: shm - updated macros for mod stats api uuid: detect if pkg-config knows about uuid lib mem/tlsf_malloc: updates to use new api names for module stats mem/q_malloc: updates to use new api names for module stats mem/f_malloc: updates to use new api names for module stats core: mem/shm - use module stats fields for init of managers core: mem/pkg - use module stats fields for init of managers q core - mem: renamed api fields for module stats to repleft the purpose tm: coherent indentation p_usrloc: free allocated items in case of no more memory during domain add core: mem - export pkg api even when using system malloc presence: remove jumping to error from error in update_presentity() http_client: check first if pointer is not exceeding limit usrloc: if no location record loaded from db, then no attrs to look up ...

---

Modified: Makefile.defs Modified: lib/srdb1/schema/location.xml Modified: lib/trie/dtrie.c Modified: mem/f_malloc.c Modified: mem/memapi.h Modified: mem/pkg.c Modified: mem/pkg.h Modified: mem/q_malloc.c Modified: mem/shm.c Modified: mem/shm.h Modified: mem/tlsf_malloc.c Modified: modules/cnxcc/Makefile Modified: modules/crypto/crypto_mod.c Modified: modules/dispatcher/dispatch.c Modified: modules/dispatcher/dispatcher.c Modified: modules/http_async_client/Makefile Modified: modules/http_client/curlcon.c Modified: modules/ndb_redis/Makefile Modified: modules/ndb_redis/redis_client.c Modified: modules/p_usrloc/dlist.c Modified: modules/presence/presentity.c Modified: modules/seas/encode_msg.c Modified: modules/sipcapture/hep.c Modified: modules/tm/tm.c Modified: modules/topos/tps_msg.c Modified: modules/usrloc/udomain.c Modified: modules/uuid/Makefile Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql

---

Diff: https://github.com/kamailio/kamailio/commit/78bc680355075304e6e93d91347a564a... Patch: https://github.com/kamailio/kamailio/commit/78bc680355075304e6e93d91347a564a...