automerge commit

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

BUGS

@@ -10,7 +10,7 @@ For more information on using the bug tracker, or to
 learn how you can contribute by acting as a bug marshall
 please see:
 
-	http://www.digium.com/index.php?menu=bugguidelines
+	http://www.asterisk.org/developers/bug-guidelines
 
 If you would like to submit a feature request, please
 resist the temptation to post it to the bug tracker.

channels/chan_iax2.c

@@ -1260,7 +1260,7 @@ static int try_firmware(char *s)
 		return -1;
 	}
 	fwh = mmap(NULL, stbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); 
-	if (!fwh) {
+	if (fwh == (void *) -1) {
 		ast_log(LOG_WARNING, "mmap failed: %s\n", strerror(errno));
 		close(fd);
 		return -1;

channels/chan_sip.c

@@ -9801,6 +9801,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
 		if (!ignore)
 			sip_cancel_destroy(p);
 		check_pendings(p);
+		ast_set_flag(p, SIP_CAN_BYE);
 		break;
 	case 180:	/* 180 Ringing */
 		if (!ignore)
@@ -11031,11 +11032,11 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req, int de
 	} else if (p->owner) {
 		ast_queue_hangup(p->owner);
 		if (option_debug > 2)
-			ast_log(LOG_DEBUG, "Received bye, issuing owner hangup\n.");
+			ast_log(LOG_DEBUG, "Received bye, issuing owner hangup\n");
 	} else {
 		ast_set_flag(p, SIP_NEEDDESTROY);	
 		if (option_debug > 2)
-			ast_log(LOG_DEBUG, "Received bye, no owner, selfdestruct soon.\n.");
+			ast_log(LOG_DEBUG, "Received bye, no owner, selfdestruct soon.\n");
 	}
 	transmit_response(p, "200 OK", req);
 

funcs/func_math.c

@@ -124,7 +124,6 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
 			iaction = LTEFUNCTION;
 		}
 	} else if ((op = strchr(mvalue1, '='))) {
-		iaction = GTFUNCTION;
 		*op = '\0';
 		if (*(op+1) == '=') {
 			*++op = '\0';