automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4cbf625483a779d6949b744c340eb056df9599d7..778c5e55694586be4f2b011ec7f3672610468231 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10366,7 +10366,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
                if (supported)
                        parse_sip_options(p, supported);
        }
-       required = get_header(req, "Required");
+       required = get_header(req, "Require");
        if (!ast_strlen_zero(required)) {
                required_profile = parse_sip_options(NULL, required);
                if (required_profile) {         /* They require something */
@@ -11128,7 +11128,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
                        if (!ignore && req->method == SIP_INVITE) {
                                transmit_response_reliable(p, "481 Call/Transaction Does Not Exist", req, 1);
                                /* Will cease to exist after ACK */
-                       } else {
+                       } else if (req->method != SIP_ACK) {
                                transmit_response(p, "481 Call/Transaction Does Not Exist", req);
                                ast_set_flag(p, SIP_NEEDDESTROY);
                        }