Merge branch 'master' of fs-git:freeswitch

src/switch_ivr_originate.c

@@ -2065,7 +2065,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 		goto done;
 	}
 
-	if ((flags & SOF_NOBLOCK) && var_event && (var = switch_event_get_header(var_event, "originate_delay_start"))) {
+	if (!(flags & SOF_NOBLOCK) && var_event && (var = switch_event_get_header(var_event, "originate_delay_start"))) {
 		int tmp = atoi(var);
 		if (tmp > 0) {
 			while (tmp && (!cancel_cause || *cancel_cause == 0)) {

src/switch_xml.c

@@ -1982,7 +1982,7 @@ static void switch_xml_user_cache(const char *key, const char *user_name, const
 	}
 	if (expires) {
 		char *expires_val = malloc(1024);
-		if (sprintf(expires_val, "%ld", expires)) {
+		if (sprintf(expires_val, "%ld", (long)expires)) {
 			switch_core_hash_insert(CACHE_EXPIRES_HASH, mega_key, expires_val);
 		}
 	}