automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-14 19:04:48 +00:00
parent b670fe8554
commit 13d5513465
3 changed files with 21 additions and 3 deletions

View File

@@ -4371,7 +4371,7 @@ static int add_sdp(struct sip_request *resp, struct sip_pvt *p)
ast_log(LOG_WARNING, "No way to add SDP without an RTP structure\n");
return -1;
}
capability = p->capability;
capability = p->jointcapability;
if (!p->sessionid) {
p->sessionid = getpid();