[sr-dev] git:kamailio_3.0: Merge remote branch 'origin/sr_3.0' into kamailio_3.0

[Daniel-Constantin Mierla]

Module: sip-router
Branch: kamailio_3.0
Commit: 39ce77440b5d72a8a197ca06ff579371134bcacf
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39ce77440b5d72a8a197ca06ff579371134bcacf

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Fri Oct 30 15:01:41 2009 +0100

Merge remote branch 'origin/sr_3.0' into kamailio_3.0

* origin/sr_3.0:
  fix typo in location flags settings
  Rewritten this small helper function
  When string was in the form of 0=on\n\0 this function caused a segmentation fault(canaries where overwritten).
  Removed unused var (added last commit)
  Fixed avpops avp_db_store as before no state was used and it caused to loop endessly.
  Declared pua_send_publish ,as it was only defined (extern)
  Fixed tm_load import (It would be advisable to use tm_load_api instead )
  Fixed include guard
  Added kmi module to linkage (because of  ../../modules_k/xcap_client/xcap_client.so: undefined symbol: register_mi_mod  )
  Fixed carrierroute module exports.
  Fixed userblacklist exported function
  If the user parameter is "<null>" (e.g a empty username in the request URI), do not copy this value to the rewritten uri.
  lib/srdb1/schema/gw.xml: index changes
  modules/lcr: bug fixes
  htable(k): fix non-init act. ctx in event route execution
  tm: fix/support changing r-uris and path in branch routes

Conflicts:
	.gitignore
	Makefile
	Makefile.defs
	Makefile.dirs
	cfg.lex
	cfg.y
	etc/kamailio.cfg
	events.c
	events.h
	forward.c
	lib/srdb1/schema/gw.xml
	modules/avpops/avpops_impl.c
	modules/carrierroute/carrierroute.c
	modules/carrierroute/cr_func.c
	modules/carrierroute/cr_func.h
	modules/lcr/README
	modules/lcr/doc/lcr_admin.xml
	modules/lcr/lcr_mod.c
	modules/lcr/lcr_rpc.c
	modules/tm/h_table.c
	modules/tm/h_table.h
	modules/tm/t_fwd.c
	modules/tm/t_fwd.h
	modules/tm/t_hooks.c
	modules/tm/t_reply.c
	modules/tm/uac.c
	modules/utils/conf.c
	modules_k/htable/htable.c
	modules_k/kex/core_stats.c
	modules_k/pua_dialoginfo/pua_dialoginfo.c
	modules_k/pua_usrloc/pua_usrloc.c
	modules_k/pua_usrloc/pua_usrloc.h
	modules_k/pua_xmpp/pua_xmpp.c
	modules_k/pv/pv.c
	modules_k/pv/pv_branch.c
	modules_k/pv/pv_branch.h
	modules_k/userblacklist/userblacklist.c
	modules_k/xcap_client/Makefile
	modules_s/domain/domain_mod.c
	modules_s/registrar/save.c
	parser/msg_parser.c
	parser/parse_uri.c
	receive.c
	utils/kamctl/Makefile

---