[SR-Dev] git:master: Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/ sip-router

Andrei Pelinescu-Onciul andrei at iptel.org
Thu Mar 5 18:43:47 CET 2009


Module: sip-router
Branch: master
Commit: d7a5e7bc4343c6638207c7343891126e37e20495
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7a5e7bc4343c6638207c7343891126e37e20495

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Thu Mar  5 18:43:52 2009 +0100

Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router

* 'ser_core_cvs' of ssh://git.sip-router.org/sip-router:
  tcp: config option to disable active connects
  tcp: async mode on by default
  tcp: enable runtime changing for most of the cfg vars
  tcp: use dynamic config framework, part 2
  tcp: use dynamic config framework, part 1
  test: updated parse uri test program
  sctp: rpc info command
  sctp: connection reuse & connection tracking
  sctp: empty  sctp_handle_assoc_change added
  regfree() function call is added to free the memory allocated by regcomp().

Conflicts:
	usr_avp.c - regex free fix from sip-router conflicted with the
	            one from ser (they were the same)

---






More information about the sr-dev mailing list