Module: sip-router Branch: pd/outbound Commit: 9a4afeecf8d1166533fefd4df2afc850a44c9ec3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a4afeec...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Wed Mar 13 16:57:11 2013 +0000

Merge branch 'master' into outbound

* master: (68 commits) modules/permissions: DNS domain names in address table modules/app_java - New module app_java: Java Native Interface support. nathelper: Decrease ambiguity by renaming sipping_disable_bflag to natping_disable_bflag registrar: New set_q_override function parser,modules/pv,modules/sipcapture: Improved parsing of P-Asserted/Preferred-Identity headers Makefile.dirs: updated the list with module directories NEWS Update with reference to Wiki INSTALL update for release README - last minute small edits tm: set proper buffer len when Max-Forward header is not added core: try to detect ipv6 addresses only when USE_IPV6 is used pkg: deb specs updated for v4.0.0 INSTALL: updates for v4.0.0 ChangeLog_k: removed obsolete file ChangeLog: updated content to prepare for v4.0.0 sca: fix regression dropping Expires header from SUBSCRIBE replies. sca: move SUBSCRIBE response handling to sca_subscription_reply sca: reject out-of-dialog attempts to seize privately held call. sca: make sca_reply a generic reply function. pkg/kamailio/(centos|fedora): added docbook2X build requirement ...

Conflicts: modules/registrar/save.h

---