[sr-dev] git:master:5ff78824: Merge remote branch 'origin/master' into tmp/hpw_curl_improvements

[Hugh Waite]

Module: kamailio
Branch: master
Commit: 5ff788247f7baffa0cabce01255f6eba0702b5c5
URL: https://github.com/kamailio/kamailio/commit/5ff788247f7baffa0cabce01255f6eba0702b5c5

Author: Hugh Waite <hugh.waite at xura.com>
Committer: Hugh Waite <hugh.waite at xura.com>
Date: 2016-01-21T15:13:30Z

Merge remote branch 'origin/master' into tmp/hpw_curl_improvements

---

Added: modules/cfgt/Makefile
Added: modules/cfgt/README
Added: modules/cfgt/cfgt.c
Added: modules/cfgt/cfgt.h
Added: modules/cfgt/cfgt_int.c
Added: modules/cfgt/cfgt_int.h
Added: modules/cfgt/cfgt_json.c
Added: modules/cfgt/cfgt_json.h
Added: modules/cfgt/cfgt_mod.c
Added: modules/cfgt/cfgt_mod.h
Added: modules/cfgt/doc/Makefile
Added: modules/cfgt/doc/cfgt.xml
Added: modules/cfgt/doc/cfgt_admin.xml
Added: modules/crypto/Makefile
Added: modules/crypto/README
Added: modules/crypto/crypto_mod.c
Added: modules/crypto/doc/Makefile
Added: modules/crypto/doc/crypto.xml
Added: modules/crypto/doc/crypto_admin.xml
Added: modules/rtpengine/rtpengine_hash.c
Added: modules/rtpengine/rtpengine_hash.h
Modified: Makefile.defs
Modified: Makefile.groups
Modified: dprint.c
Modified: dprint.h
Modified: events.c
Modified: events.h
Modified: forward.h
Modified: ip_addr.h
Modified: lib/srdb1/schema/uacreg.xml
Modified: modules/auth_radius/authrad_mod.c
Modified: modules/auth_radius/authrad_mod.h
Modified: modules/auth_radius/doc/auth_radius.xml
Modified: modules/auth_radius/doc/auth_radius_admin.xml
Modified: modules/auth_radius/sterman.c
Modified: modules/carrierroute/cr_fifo.c
Modified: modules/cdp/routing.c
Modified: modules/cnxcc/cnxcc.c
Modified: modules/cnxcc/cnxcc.h
Modified: modules/curl/TODO.txt
Modified: modules/curl/curl_api.h
Modified: modules/db_mysql/km_dbase.c
Modified: modules/db_text/dbt_base.c
Modified: modules/db_text/dbt_lib.c
Modified: modules/db_text/dbt_raw_util.c
Modified: modules/db_text/dbtext.c
Modified: modules/db_text/dbtext.h
Modified: modules/debugger/Makefile
Modified: modules/debugger/README
Modified: modules/debugger/debugger_api.c
Modified: modules/debugger/debugger_api.h
Modified: modules/debugger/debugger_mod.c
Modified: modules/debugger/doc/debugger_admin.xml
Modified: modules/dispatcher/README
Modified: modules/dispatcher/dispatch.c
Modified: modules/dispatcher/doc/dispatcher.cfg
Modified: modules/dmq_usrloc/usrloc_sync.c
Modified: modules/htable/htable.c
Modified: modules/ims_auth/cxdx_mar.c
Modified: modules/ims_charging/dialog.c
Modified: modules/ims_charging/dialog.h
Modified: modules/ims_charging/ims_ro.c
Modified: modules/ims_charging/ims_ro.h
Modified: modules/ims_charging/mod.c
Modified: modules/ims_charging/ro_session_hash.c
Modified: modules/ims_charging/ro_session_hash.h
Modified: modules/ims_charging/ro_timer.c
Modified: modules/ims_qos/rx_str.c
Modified: modules/ims_registrar_scscf/registrar_notify.c
Modified: modules/ims_registrar_scscf/registrar_notify.h
Modified: modules/ims_usrloc_scscf/udomain.c
Modified: modules/ims_usrloc_scscf/udomain.h
Modified: modules/ims_usrloc_scscf/usrloc.h
Modified: modules/matrix/README
Modified: modules/matrix/doc/matrix_admin.xml
Modified: modules/nat_traversal/nat_traversal.c
Modified: modules/ndb_mongodb/README
Modified: modules/ndb_mongodb/doc/ndb_mongodb_admin.xml
Modified: modules/permissions/README
Modified: modules/permissions/doc/permissions_admin.xml
Modified: modules/permissions/hash.c
Modified: modules/permissions/hash.h
Modified: modules/permissions/permissions.c
Modified: modules/presence/notify.c
Modified: modules/presence/publish.c
Modified: modules/presence_dialoginfo/add_events.c
Modified: modules/presence_dialoginfo/notify_body.c
Modified: modules/presence_xml/notify_body.c
Modified: modules/registrar/reg_mod.c
Modified: modules/rtpengine/doc/rtpengine_admin.xml
Modified: modules/rtpengine/rtpengine.c
Modified: modules/rtpengine/rtpengine.h
Modified: modules/siptrace/README
Modified: modules/siptrace/doc/siptrace_admin.xml
Modified: modules/siptrace/siptrace.c
Modified: modules/smsops/doc/smsops_admin.xml
Modified: modules/statsd/lib_statsd.c
Modified: modules/statsd/lib_statsd.h
Modified: modules/tcpops/tcpops.c
Modified: modules/tcpops/tcpops.h
Modified: modules/tcpops/tcpops_mod.c
Modified: modules/tls/README
Modified: modules/tls/doc/rpc.xml
Modified: modules/tm/h_table.c
Modified: modules/tm/h_table.h
Modified: modules/tm/t_funcs.c
Modified: modules/tm/t_funcs.h
Modified: modules/tm/t_fwd.c
Modified: modules/tm/t_reply.c
Modified: modules/tm/t_serial.c
Modified: modules/tm/t_stats.c
Modified: modules/tm/t_stats.h
Modified: modules/tmx/doc/tmx_admin.xml
Modified: modules/tmx/tmx_mod.c
Modified: modules/topoh/topoh_mod.c
Modified: modules/tsilo/ts_append.c
Modified: modules/tsilo/ts_handlers.c
Modified: modules/tsilo/ts_hash.c
Modified: modules/uac/README
Modified: modules/uac/doc/uac_admin.xml
Modified: modules/uac/uac.c
Modified: modules/uac/uac_reg.c
Modified: modules/uac/uac_send.c
Modified: modules/utils/utils.c
Modified: modules/websocket/Makefile
Modified: parser/msg_parser.c
Modified: pkg/kamailio/deb/debian/changelog
Modified: pkg/kamailio/deb/jessie/changelog
Modified: pkg/kamailio/deb/jessie/kamailio.service
Modified: pkg/kamailio/deb/precise/changelog
Modified: pkg/kamailio/deb/sid/changelog
Modified: pkg/kamailio/deb/sid/kamailio.service
Modified: pkg/kamailio/deb/squeeze/changelog
Modified: pkg/kamailio/deb/stretch/changelog
Modified: pkg/kamailio/deb/stretch/kamailio.service
Modified: pkg/kamailio/deb/trusty/changelog
Modified: pkg/kamailio/deb/wheezy/changelog
Modified: receive.c
Modified: socket_info.c
Modified: tcp_read.c
Modified: utils/kamctl/db_berkeley/kamailio/uacreg
Modified: utils/kamctl/db_berkeley/kamailio/version
Modified: utils/kamctl/db_sqlite/uac-create.sql
Modified: utils/kamctl/dbtext/kamailio/uacreg
Modified: utils/kamctl/dbtext/kamailio/version
Modified: utils/kamctl/kamctl
Modified: utils/kamctl/kamdbctl
Modified: utils/kamctl/mysql/uac-create.sql
Modified: utils/kamctl/oracle/uac-create.sql
Modified: utils/kamctl/postgres/uac-create.sql
Modified: utils/kamctl/xhttp_pi/pi_framework.xml
Modified: utils/kamctl/xhttp_pi/uac-mod
Modified: utils/kamctl/xhttp_pi/uac-table

---

Diff:  https://github.com/kamailio/kamailio/commit/5ff788247f7baffa0cabce01255f6eba0702b5c5.diff
Patch: https://github.com/kamailio/kamailio/commit/5ff788247f7baffa0cabce01255f6eba0702b5c5.patch