[OpenSIPS-Devel] [OpenSIPS/opensips] 505fcb: Merge pull request #1 from OpenSIPS/master

Bogdan Andrei IANCU bogdan at opensips.org
Tue Dec 22 18:46:06 CET 2015


  Branch: refs/heads/master
  Home:   https://github.com/OpenSIPS/opensips
  Commit: 505fcb243c7ca6289306f613387c3e64e32ce57b
      https://github.com/OpenSIPS/opensips/commit/505fcb243c7ca6289306f613387c3e64e32ce57b
  Author: Sergey KHripchenko <shripchenko at intermedia.net>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M .travis.yml
    M Makefile
    M Makefile.conf.template
    M Makefile.defs
    M bin_interface.c
    M bin_interface.h
    A db/schema/clusterer.xml
    A db/schema/opensips-clusterer.xml
    M fastlock.h
    M forward.h
    M futex_lock.h
    M io_wait.h
    M io_wait_loop.h
    M lock_ops.h
    M main.c
    M menuconfig/curses.c
    M menuconfig/main.c
    M menuconfig/parser.c
    M modules/acc/acc.c
    M modules/cachedb_couchbase/cachedb_couchbase_dbase.c
    M modules/cachedb_redis/cachedb_redis_utils.c
    M modules/cachedb_redis/cachedb_redis_utils.h
    A modules/clusterer/Makefile
    A modules/clusterer/README
    A modules/clusterer/api.h
    A modules/clusterer/clusterer.c
    A modules/clusterer/clusterer.h
    A modules/clusterer/doc/clusterer.xml
    A modules/clusterer/doc/clusterer_admin.xml
    A modules/clusterer/doc/clusterer_devel.xml
    M modules/compression/compression_helpers.c
    M modules/compression/compression_helpers.h
    M modules/db_berkeley/bdb_val.c
    M modules/db_perlvdb/perlvdbfunc.c
    M modules/db_sqlite/dbase.c
    M modules/db_sqlite/my_con.c
    M modules/db_sqlite/my_con.h
    M modules/db_sqlite/res.c
    M modules/db_sqlite/row.c
    M modules/db_text/README
    M modules/db_text/dbt_file.c
    M modules/db_text/dbt_lib.c
    M modules/db_text/dbt_lib.h
    M modules/db_text/dbtext.c
    M modules/db_text/doc/db_text_admin.xml
    M modules/dialog/README
    M modules/dialog/dialog.c
    M modules/dialog/dlg_handlers.c
    M modules/dialog/dlg_hash.c
    M modules/dialog/dlg_hash.h
    M modules/dialog/dlg_profile.c
    M modules/dialog/dlg_repl_profile.h
    M modules/dialog/dlg_replication.c
    M modules/dialog/dlg_replication.h
    M modules/dialog/dlg_req_within.c
    M modules/dialog/doc/dialog_admin.xml
    M modules/emergency/emergency_methods.c
    M modules/emergency/emergency_methods.h
    M modules/emergency/hash.c
    M modules/emergency/hash.h
    M modules/emergency/http_emergency.c
    M modules/emergency/http_emergency.h
    M modules/emergency/model.h
    M modules/emergency/notifier_emergency.c
    M modules/emergency/notifier_emergency.h
    M modules/emergency/post_curl.c
    M modules/emergency/post_curl.h
    M modules/emergency/report_emergency.c
    M modules/emergency/report_emergency.h
    M modules/emergency/sip_emergency.c
    M modules/emergency/sip_emergency.h
    M modules/emergency/subscriber_emergency.c
    M modules/emergency/subscriber_emergency.h
    M modules/emergency/xml_parser.c
    M modules/emergency/xml_parser.h
    M modules/load_balancer/README
    M modules/load_balancer/doc/load_balancer_admin.xml
    M modules/load_balancer/lb_data.c
    M modules/load_balancer/lb_data.h
    M modules/load_balancer/load_balancer.c
    M modules/mi_xmlrpc_ng/README
    M modules/mi_xmlrpc_ng/doc/mi_xmlrpc_ng_admin.xml
    M modules/mi_xmlrpc_ng/mi_xmlrpc_http.c
    M modules/nathelper/README
    M modules/nathelper/doc/nathelper_admin.xml
    M modules/nathelper/nathelper.c
    A modules/nathelper/nh_locks.h
    A modules/nathelper/nh_table.c
    A modules/nathelper/nh_table.h
    M modules/nathelper/sip_pinger.h
    M modules/osp/Makefile
    M modules/osp/README
    M modules/osp/RELEASE-NOTES.txt
    M modules/osp/destination.c
    M modules/osp/destination.h
    M modules/osp/doc/osp_admin.xml
    M modules/osp/etc/sample-osp-opensips.cfg
    M modules/osp/globals.c
    M modules/osp/orig_transaction.c
    M modules/osp/orig_transaction.h
    M modules/osp/osp_mod.c
    M modules/osp/osp_mod.h
    M modules/osp/sipheader.c
    M modules/osp/sipheader.h
    M modules/osp/term_transaction.c
    M modules/osp/usage.c
    M modules/osp/usage.h
    M modules/perl/Makefile
    M modules/perl/opensipsxs.xs
    M modules/perl/perl.c
    M modules/presence/publish.c
    M modules/proto_bin/proto_bin.c
    M modules/proto_tls/README
    M modules/proto_tls/doc/proto_tls.xml
    M modules/proto_tls/doc/proto_tls_admin.xml
    M modules/proto_tls/doc/proto_tls_devel.xml
    M modules/proto_tls/proto_tls.c
    R modules/proto_tls/tls_config.c
    R modules/proto_tls/tls_config.h
    R modules/proto_tls/tls_domain.c
    R modules/proto_tls/tls_domain.h
    R modules/proto_tls/tls_params.c
    R modules/proto_tls/tls_params.h
    R modules/proto_tls/tls_select.c
    R modules/proto_tls/tls_select.h
    M modules/proto_tls/tls_server.c
    M modules/proto_tls/tls_server.h
    M modules/ratelimit/ratelimit.c
    M modules/ratelimit/ratelimit.h
    M modules/ratelimit/ratelimit_helper.c
    M modules/rtpproxy/rtpproxy.c
    A modules/tls_mgm/Makefile
    A modules/tls_mgm/README
    A modules/tls_mgm/api.h
    A modules/tls_mgm/doc/tls_mgm.xml
    A modules/tls_mgm/doc/tls_mgm_admin.xml
    A modules/tls_mgm/doc/tls_mgm_devel.xml
    A modules/tls_mgm/tls.h
    A modules/tls_mgm/tls_config.c
    A modules/tls_mgm/tls_config.h
    A modules/tls_mgm/tls_config_helper.h
    A modules/tls_mgm/tls_domain.c
    A modules/tls_mgm/tls_domain.h
    A modules/tls_mgm/tls_helper.h
    A modules/tls_mgm/tls_mgm.c
    A modules/tls_mgm/tls_params.c
    A modules/tls_mgm/tls_params.h
    A modules/tls_mgm/tls_select.c
    A modules/tls_mgm/tls_select.h
    M modules/uac/auth.c
    M modules/uac/uac.c
    M modules/usrloc/dlist.c
    M modules/usrloc/ucontact.c
    M modules/usrloc/udomain.c
    M modules/usrloc/ul_mi.c
    M modules/usrloc/ul_mod.c
    M modules/usrloc/urecord.c
    M modules/usrloc/ureplication.c
    M modules/usrloc/ureplication.h
    M net/net_tcp.c
    M net/proto_udp/proto_udp.c
    M packaging/debian/changelog
    M packaging/debian/control
    M packaging/debian/copyright
    M packaging/debian/opensips.init
    A packaging/debian/opensips.service
    A packaging/debian/opensips.tmpfile
    M packaging/debian/rules
    A scripts/db_berkeley/opensips/clusterer
    M scripts/db_berkeley/opensips/version
    A scripts/dbtext/opensips/clusterer
    A scripts/mysql/clusterer-create.sql
    M scripts/opensipsdbctl.base
    A scripts/oracle/clusterer-create.sql
    A scripts/pi_http/clusterer-mod
    A scripts/pi_http/clusterer-table
    M scripts/pi_http/pi_framework.xml
    A scripts/postgres/clusterer-create.sql
    A scripts/sqlite/clusterer-create.sql
    M sr_module.c
    M ut.h
    M version.h

  Log Message:
  -----------
  Merge pull request #1 from OpenSIPS/master

Update fork to origin


  Commit: 0a347bd80a16e45218c88cd79faa414d2fa74df7
      https://github.com/OpenSIPS/opensips/commit/0a347bd80a16e45218c88cd79faa414d2fa74df7
  Author: Sergey KHripchenko <shripchenko at intermedia.net>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M Makefile.defs
    M config.h
    A db/schema/opensips-tls_mgm.xml
    M db/schema/pr_xcap.xml
    A db/schema/tls_mgm.xml
    M etc/tls/rootCA/private/cakey.pem
    M ip_addr.h
    M modules/avpops/avpops.c
    M modules/b2b_entities/dlg.c
    M modules/clusterer/README
    M modules/clusterer/doc/clusterer.xml
    M modules/db_sqlite/res.c
    M modules/dialog/README
    M modules/dialog/doc/dialog_admin.xml
    M modules/dialplan/dialplan.c
    M modules/dialplan/dp_db.c
    M modules/dispatcher/dispatcher.c
    M modules/exec/README
    M modules/exec/doc/exec_admin.xml
    M modules/exec/exec.c
    M modules/proto_tls/README
    M modules/proto_tls/doc/proto_tls.xml
    M modules/proto_tls/doc/proto_tls_admin.xml
    M modules/proto_tls/proto_tls.c
    M modules/proto_tls/tls_server.c
    M modules/proto_tls/tls_server.h
    M modules/proto_ws/proto_ws.c
    R modules/proto_ws/ws.c
    R modules/proto_ws/ws.h
    A modules/proto_ws/ws_common.h
    A modules/proto_ws/ws_common_defs.h
    R modules/proto_ws/ws_handshake.c
    A modules/proto_ws/ws_handshake_common.h
    M modules/proto_ws/ws_tcp.c
    M modules/proto_ws/ws_tcp.h
    M modules/ratelimit/README
    M modules/ratelimit/doc/ratelimit_admin.xml
    M modules/regex/regex_mod.c
    M modules/tls_mgm/README
    M modules/tls_mgm/api.h
    M modules/tls_mgm/doc/tls_mgm.xml
    M modules/tls_mgm/doc/tls_mgm_admin.xml
    M modules/tls_mgm/doc/tls_mgm_devel.xml
    M modules/tls_mgm/tls.h
    M modules/tls_mgm/tls_config.c
    M modules/tls_mgm/tls_config.h
    M modules/tls_mgm/tls_domain.c
    M modules/tls_mgm/tls_domain.h
    M modules/tls_mgm/tls_helper.h
    M modules/tls_mgm/tls_mgm.c
    M modules/tls_mgm/tls_params.c
    M modules/tls_mgm/tls_params.h
    M modules/tm/h_table.h
    M modules/tm/t_msgbuilder.c
    M modules/tm/t_reply.c
    M modules/uri/README
    M modules/uri/checks.c
    M modules/uri/checks.h
    M modules/uri/doc/uri_admin.xml
    M modules/uri/uri_mod.c
    M modules/usrloc/README
    M modules/usrloc/doc/usrloc_admin.xml
    M msg_translator.c
    M net/net_udp.c
    M packaging/debian/control
    M packaging/debian/opensips.init
    M parser/parse_via.c
    M resolve.c
    A scripts/db_berkeley/opensips/tls_mgm
    M scripts/db_berkeley/opensips/version
    A scripts/dbtext/opensips/tls_mgm
    M scripts/dbtext/opensips/version
    M scripts/mysql/presence-create.sql
    A scripts/mysql/tls_mgm-create.sql
    M scripts/opensipsdbctl.base
    A scripts/oracle/tls_mgm-create.sql
    M scripts/pi_http/pi_framework.xml
    M scripts/pi_http/presence-table
    A scripts/pi_http/tls_mgm-mod
    A scripts/pi_http/tls_mgm-table
    A scripts/postgres/tls_mgm-create.sql
    A scripts/sqlite/tls_mgm-create.sql
    M socket_info.h

  Log Message:
  -----------
  Merge pull request #2 from OpenSIPS/master

Merge upstream OpenSIPS/master to fork


  Commit: 35be9c94275aea35b5db0478c39c3b40abb4d5ee
      https://github.com/OpenSIPS/opensips/commit/35be9c94275aea35b5db0478c39c3b40abb4d5ee
  Author: Sergey Khripchenko <shripchenko at intermedia.net>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M modules/load_balancer/load_balancer.c

  Log Message:
  -----------
  properly handle wrong params count in fixup functions


  Commit: 9dbfdfad04f034d8e0aed926851b45ea28b08182
      https://github.com/OpenSIPS/opensips/commit/9dbfdfad04f034d8e0aed926851b45ea28b08182
  Author: Bogdan Andrei IANCU <bogdan at opensips.org>
  Date:   2015-12-22 (Tue, 22 Dec 2015)

  Changed paths:
    M modules/load_balancer/load_balancer.c

  Log Message:
  -----------
  Merge pull request #661 from shripchenko/lb_fixup_fix

load balancer: fixup functions fixes


Compare: https://github.com/OpenSIPS/opensips/compare/420b663c29fd...9dbfdfad04f0


More information about the Devel mailing list