automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2b73993d71b1d76f631837caaa5d31db5e939f4e..ece3bdbd64d6b93473b867cb0d1edf7070f7360c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4156,7 +4156,7 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, char *msg, stru
                        snprintf(contact, sizeof(contact), "%s;expires=%d", p->our_contact, p->expiry);
                        add_header(resp, "Contact", contact);   /* Not when we unregister */
                }
-       } else if (p->our_contact[0]) {
+       } else if (msg[0] != '4' && p->our_contact[0]) {
                add_header(resp, "Contact", p->our_contact);
        }
        return 0;