Merged revisions 221432 via svnmerge from

Merged revisions 221432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r221432 | mnicholson | 2009-09-30 15:40:20 -0500 (Wed, 30 Sep 2009) | 17 lines

  Merged revisions 221360 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r221360 | mnicholson | 2009-09-30 14:36:06 -0500 (Wed, 30 Sep 2009) | 10 lines

    Fix SRV lookup and Request-URI generation in chan_sip.

    This patch adds a new field "portinuri" to the sip dialog struct and the sip peer struct.  That field is used during RURI generation to determine if the port should be included in the RURI.  It is also used in some places to determine if an SRV lookup should occur.

    (closes issue #14418)
    Reported by: klaus3000
    Tested by: klaus3000, mnicholson

    Review: https://reviewboard.asterisk.org/r/369/
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@221478 65c4cc65-6c06-0410-ace0-fbb531ad65f3