one least tweak to last 2 commits

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13405 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/endpoints/mod_sofia/sofia.c

@@ -2911,7 +2911,14 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
 			char var_name[80];	
 			
 			if (sofia_test_pflag(profile, PFLAG_PROXY_FOLLOW_REDIRECT) && tech_pvt->route_uri && p_contact && p_contact->m_url) {
-				tech_pvt->route_uri = switch_core_session_strdup(tech_pvt->session, (const char *) p_contact->m_url);
+				if (p_contact->m_url->url_port) {
+					tech_pvt->route_uri = switch_core_session_sprintf(tech_pvt->session, "sip:%s@%s:%s", 
+																	  p_contact->m_url->url_user, p_contact->m_url->url_host, p_contact->m_url->url_port);
+				} else {
+					tech_pvt->route_uri = switch_core_session_sprintf(tech_pvt->session, "sip:%s@%s", 
+																	  p_contact->m_url->url_user, p_contact->m_url->url_host);
+				}
+
 				nua_set_hparams(tech_pvt->nh, NUTAG_PROXY(tech_pvt->route_uri), TAG_END());
 			}