Merge branch 'master' of git.freeswitch.org:freeswitch

libs/sofia-sip/libsofia-sip-ua/nua/nua_notifier.c

@@ -704,7 +704,7 @@ int nua_notify_client_request(nua_client_request_t *cr,
       if (sr->sr_usage == du) {
 	/* If subscribe has not been responded, don't terminate usage by NOTIFY */
 	sr->sr_terminating = 1;
-	nua_client_set_terminating(cr, 0);
+	// nua_client_set_terminating(cr, 0);
 	break;
       }
     }

src/mod/endpoints/mod_sofia/sofia_presence.c

@@ -1026,7 +1026,7 @@ static char *translate_rpid(char *in)
 	}
 
 	if (!strcasecmp(in, "unknown")) {
-		r = "online";
+		r = NULL;
 		goto end;
 	}
 
@@ -1238,8 +1238,6 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 		rpid = "unknown";
 	}
 
-	prpid = translate_rpid(rpid);
-
 	if (!strcasecmp(proto, SOFIA_CHAT_PROTO)) {
 		clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host);
 	} else {